wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 587614. Remove use of MOZ_NO_INSPECTOR_APIS. r=roc,a=NPOTB

Browse Source
This commit is contained in:
Takanori MATSUURA 2010-08-19 21:44:01 +12:00
parent 8828445ae0
commit 05b4001200
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/Makefile.in
View File

@ -68,12 +68,10 @@ ifdef MOZ_SVG
PARALLEL_DIRS += svg/base/src
endif
ifndef MOZ_NO_INSPECTOR_APIS
PARALLEL_DIRS += inspector/public inspector/src
ifdef ENABLE_TESTS
PARALLEL_DIRS += inspector/tests
endif
endif
DIRS += build

4
layout/build/Makefile.in
View File

@ -209,14 +209,10 @@ SHARED_LIBRARY_LIBS += \
$(NULL)
endif
ifndef MOZ_NO_INSPECTOR_APIS
LOCAL_INCLUDES += \
-I$(srcdir)/../inspector/src \
$(NULL)
SHARED_LIBRARY_LIBS += ../inspector/src/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX)
else
DEFINES += -DMOZ_NO_INSPECTOR_APIS
endif
ifdef MOZ_MATHML
SHARED_LIBRARY_LIBS += \

10
layout/build/nsLayoutModule.cpp
View File

@ -251,7 +251,6 @@ static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID);
#include "nsIBoxObject.h"
#ifndef MOZ_NO_INSPECTOR_APIS
#ifdef MOZ_XUL
#include "inDOMView.h"
#endif /* MOZ_XUL */
@ -260,7 +259,6 @@ static NS_DEFINE_CID(kWindowCommandTableCID, NS_WINDOWCOMMANDTABLE_CID);
#include "inFlasher.h"
#include "inCSSValueSearch.h"
#include "inDOMUtils.h"
#endif /* MOZ_NO_INSPECTOR_APIS */
#ifdef MOZ_XUL
#include "nsIXULDocument.h"
@ -502,7 +500,6 @@ MAKE_CTOR(CreateNewTreeBoxObject, nsIBoxObject, NS_NewTreeBoxObj
MAKE_CTOR(CreateNewContainerBoxObject, nsIBoxObject, NS_NewContainerBoxObject)
#endif // MOZ_XUL
#ifndef MOZ_NO_INSPECTOR_APIS
#ifdef MOZ_XUL
NS_GENERIC_FACTORY_CONSTRUCTOR(inDOMView)
#endif
@ -510,7 +507,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(inDeepTreeWalker)
NS_GENERIC_FACTORY_CONSTRUCTOR(inFlasher)
NS_GENERIC_FACTORY_CONSTRUCTOR(inCSSValueSearch)
NS_GENERIC_FACTORY_CONSTRUCTOR(inDOMUtils)
#endif
MAKE_CTOR(CreateNameSpaceManager, nsINameSpaceManager, NS_GetNameSpaceManager)
MAKE_CTOR(CreateEventListenerManager, nsIEventListenerManager, NS_NewEventListenerManager)
@ -755,7 +751,6 @@ NS_DEFINE_NAMED_CID(NS_CONTAINERBOXOBJECT_CID);
NS_DEFINE_NAMED_CID(NS_SCROLLBOXOBJECT_CID);
NS_DEFINE_NAMED_CID(NS_TREEBOXOBJECT_CID);
#endif // MOZ_XUL
#ifndef MOZ_NO_INSPECTOR_APIS
#ifdef MOZ_XUL
NS_DEFINE_NAMED_CID(IN_DOMVIEW_CID);
#endif
@ -763,7 +758,6 @@ NS_DEFINE_NAMED_CID(IN_DEEPTREEWALKER_CID);
NS_DEFINE_NAMED_CID(IN_FLASHER_CID);
NS_DEFINE_NAMED_CID(IN_CSSVALUESEARCH_CID);
NS_DEFINE_NAMED_CID(IN_DOMUTILS_CID);
#endif // MOZ_NO_INSPECTOR_APIS
NS_DEFINE_NAMED_CID(NS_NAMESPACEMANAGER_CID);
NS_DEFINE_NAMED_CID(NS_EVENTLISTENERMANAGER_CID);
NS_DEFINE_NAMED_CID(NS_DOMEVENTGROUP_CID);
@ -905,7 +899,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
{ &kNS_SCROLLBOXOBJECT_CID, false, NULL, CreateNewScrollBoxObject },
{ &kNS_TREEBOXOBJECT_CID, false, NULL, CreateNewTreeBoxObject },
#endif // MOZ_XUL
#ifndef MOZ_NO_INSPECTOR_APIS
#ifdef MOZ_XUL
{ &kIN_DOMVIEW_CID, false, NULL, inDOMViewConstructor },
#endif
@ -913,7 +906,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
{ &kIN_FLASHER_CID, false, NULL, inFlasherConstructor },
{ &kIN_CSSVALUESEARCH_CID, false, NULL, inCSSValueSearchConstructor },
{ &kIN_DOMUTILS_CID, false, NULL, inDOMUtilsConstructor },
#endif // MOZ_NO_INSPECTOR_APIS
{ &kNS_NAMESPACEMANAGER_CID, false, NULL, CreateNameSpaceManager },
{ &kNS_EVENTLISTENERMANAGER_CID, false, NULL, CreateEventListenerManager },
{ &kNS_DOMEVENTGROUP_CID, false, NULL, CreateDOMEventGroup },
@ -1050,7 +1042,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ "@mozilla.org/layout/xul-boxobject-scrollbox;1", &kNS_SCROLLBOXOBJECT_CID },
{ "@mozilla.org/layout/xul-boxobject-tree;1", &kNS_TREEBOXOBJECT_CID },
#endif // MOZ_XUL
#ifndef MOZ_NO_INSPECTOR_APIS
#ifdef MOZ_XUL
{ "@mozilla.org/inspector/dom-view;1", &kIN_DOMVIEW_CID },
#endif
@ -1058,7 +1049,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ "@mozilla.org/inspector/flasher;1", &kIN_FLASHER_CID },
{ "@mozilla.org/inspector/search;1?type=cssvalue", &kIN_CSSVALUESEARCH_CID },
{ "@mozilla.org/inspector/dom-utils;1", &kIN_DOMUTILS_CID },
#endif // MOZ_NO_INSPECTOR_APIS
{ NS_NAMESPACEMANAGER_CONTRACTID, &kNS_NAMESPACEMANAGER_CID },
{ "@mozilla.org/xml/xml-document;1", &kNS_XMLDOCUMENT_CID },
#ifdef MOZ_SVG

4
layout/build/nsLayoutStatics.cpp
View File

@ -100,10 +100,8 @@
#include "nsXULPrototypeCache.h"
#include "nsXULTooltipListener.h"
#ifndef MOZ_NO_INSPECTOR_APIS
#include "inDOMView.h"
#endif
#endif
#ifdef MOZ_MATHML
#include "nsMathMLAtoms.h"
@ -216,9 +214,7 @@ nsLayoutStatics::Initialize()
return rv;
}
#ifndef MOZ_NO_INSPECTOR_APIS
inDOMView::InitAtoms();
#endif
#endif