Skip to content

Commit

Permalink
Bug 1444745 - Part 1: Clear out xptinfo and typelib to make way for t…
Browse files Browse the repository at this point in the history
…he this patch, r=mccr8

Unfortunately, I wasn't able to figure out a way to make firefox build & run in
the intermediate stages of these commits. Because of this, I am going to just
delete most of the code which I am deleting in the first patch, as I figure that
those are somewhat uninteresting changes, and then make the other changes in the
following patches.

In total, the following things are deleted:
1. All of xpcom/typelib, except for `xpt/tools` - this directory is being
subsumed entirely into xpcom/reflect/xptinfo.
2. Most of the code in xpcom/reflect/xptinfo, it is being rewritten to avoid
allocating and contain all of the necessary data structures.
3. idl-parser's typelib.py XPT generator, as it will be replaced.
4. Most includes of files which have been deleted.

NOTE: xpcom/typelib/xpt/tools/xpt.py was not removed, as it is used by bundling
code & bundling tests, which we don't want to remove yet.
  • Loading branch information
mystor committed Apr 17, 2018
1 parent 0405ef5 commit f5f86c9
Show file tree
Hide file tree
Showing 66 changed files with 4 additions and 2,909 deletions.
4 changes: 4 additions & 0 deletions client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ configure:: $(configure-preqs)
ifneq (,$(MAKEFILE))
$(OBJDIR)/Makefile: $(OBJDIR)/config.status





$(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
else
$(OBJDIR)/Makefile: $(CONFIG_STATUS_DEPS)
Expand Down
3 changes: 0 additions & 3 deletions dom/xbl/nsXBLPrototypeBinding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,12 @@
#include "nsXBLPrototypeBinding.h"
#include "nsXBLContentSink.h"
#include "xptinfo.h"
#include "nsIInterfaceInfoManager.h"
#include "nsIDocumentObserver.h"
#include "nsGkAtoms.h"
#include "nsXBLProtoImpl.h"
#include "nsCRT.h"
#include "nsContentUtils.h"
#include "nsTextFragment.h"
#include "nsTextNode.h"
#include "nsIInterfaceInfo.h"
#include "nsIScriptError.h"

#include "nsXBLResourceLoader.h"
Expand Down
6 changes: 0 additions & 6 deletions js/xpconnect/src/XPCComponents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "mozilla/TimeStamp.h"
#include "mozilla/ResultExtensions.h"
#include "mozilla/URLPreloader.h"
#include "mozilla/XPTInterfaceInfoManager.h"
#include "mozilla/dom/DOMException.h"
#include "mozilla/dom/DOMExceptionBinding.h"
#include "mozilla/dom/BindingUtils.h"
Expand All @@ -32,7 +31,6 @@
#include "mozilla/Scheduler.h"
#include "nsZipArchive.h"
#include "nsWindowMemoryReporter.h"
#include "ShimInterfaceInfo.h"
#include "nsIException.h"
#include "nsIScriptError.h"
#include "nsISimpleEnumerator.h"
Expand Down Expand Up @@ -115,8 +113,6 @@ class nsXPCComponents_Interfaces final :

private:
virtual ~nsXPCComponents_Interfaces();

nsCOMArray<nsIInterfaceInfo> mInterfaces;
};

NS_IMETHODIMP
Expand Down Expand Up @@ -311,8 +307,6 @@ class nsXPCComponents_InterfacesByID final :

private:
virtual ~nsXPCComponents_InterfacesByID();

nsCOMArray<nsIInterfaceInfo> mInterfaces;
};

/***************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion js/xpconnect/src/XPCWrappedNativeInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "js/Wrapper.h"

#include "mozilla/MemoryReporting.h"
#include "mozilla/XPTInterfaceInfoManager.h"
#include "nsIScriptError.h"
#include "nsPrintfCString.h"
#include "nsPointerHashKeys.h"
Expand Down
1 change: 0 additions & 1 deletion js/xpconnect/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ LOCAL_INCLUDES += [
'/dom/svg',
'/layout/base',
'/layout/style',
'/xpcom/reflect/xptinfo',
]

if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
Expand Down
1 change: 0 additions & 1 deletion js/xpconnect/src/nsXPConnect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

#include "nsDOMMutationObserver.h"
#include "nsICycleCollectorListener.h"
#include "mozilla/XPTInterfaceInfoManager.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsScriptSecurityManager.h"
Expand Down
1 change: 0 additions & 1 deletion js/xpconnect/src/xpcprivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
#include "nsISupportsPrimitives.h"
#include "nsMemory.h"
#include "nsIXPConnect.h"
#include "nsIInterfaceInfo.h"
#include "nsIXPCScriptable.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
Expand Down
3 changes: 0 additions & 3 deletions toolkit/components/aboutmemory/tests/test_memoryReporters.xul
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@
present.places = true;
} else if (aPath.search(/^explicit\/images/) >= 0) {
present.images = true;
} else if (aPath.search(/^explicit\/xpti-working-set$/) >= 0) {
present.xptiWorkingSet = true;
} else if (aPath.search(/^explicit\/atoms\/dynamic\/atom-objects$/) >= 0) {
present.dynamicAtomObjects = true;
} else if (/\[System Principal\].*this-is-a-sandbox-name/.test(aPath)) {
Expand Down Expand Up @@ -260,7 +258,6 @@
ok(present.windowObjectsJsCompartments, "window-objects/.../js compartments are present");
ok(present.places, "places is present");
ok(present.images, "images is present");
ok(present.xptiWorkingSet, "xpti-working-set is present");
ok(present.dynamicAtomObjects, "dynamic/atom-objects is present");
ok(present.sandboxLocation, "sandbox locations are present");
ok(present.bigString, "large string is present");
Expand Down
3 changes: 0 additions & 3 deletions xpcom/build/XPCOMInit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@
#include "nsThreadPool.h"

#include "xptinfo.h"
#include "nsIInterfaceInfoManager.h"
#include "xptiprivate.h"
#include "mozilla/XPTInterfaceInfoManager.h"

#include "nsTimerImpl.h"
#include "TimerThread.h"
Expand Down
1 change: 0 additions & 1 deletion xpcom/build/XPCOMModule.inc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
COMPONENT(MULTIPLEXINPUTSTREAM, nsMultiplexInputStreamConstructor)

COMPONENT(VARIANT, nsVariantCCConstructor)
COMPONENT(INTERFACEINFOMANAGER_SERVICE, nsXPTIInterfaceInfoManagerGetSingleton)

COMPONENT(HASH_PROPERTY_BAG, nsHashPropertyBagCCConstructor)

Expand Down
1 change: 0 additions & 1 deletion xpcom/build/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ LOCAL_INCLUDES += [
'../ds',
'../glue',
'../io',
'../reflect/xptinfo',
'../threads',
'/chrome',
'/docshell/base',
Expand Down
1 change: 0 additions & 1 deletion xpcom/components/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ LOCAL_INCLUDES += [
'../base',
'../build',
'../ds',
'../reflect/xptinfo',
'/chrome',
'/modules/libjar',
]
Expand Down
Loading

0 comments on commit f5f86c9

Please sign in to comment.