Merge mozilla-central to mozilla-inbound (31a0f2b0) · Commits · Tommy Webb / Tor Browser

browser/devtools/debugger/test/Makefile.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ MOCHITEST_BROWSER_TESTS = \
		browser_dbg_propertyview-09.js \
		browser_dbg_propertyview-10.js \
		browser_dbg_propertyview-edit.js \
		browser_dbg_reload-same-script.js \
		$(warning browser_dbg_reload-same-script.js temporarily disabled due to oranges, see bug 780198 & bug 782179) \
		browser_dbg_panesize.js \
		browser_dbg_panesize-inner.js \
		browser_dbg_stack-01.js \

+11 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ class nsWindowSizes;
		namespace mozilla {
		namespace css {
		class Loader;
		class ImageLoader;
		} // namespace css

		namespace dom {
		@@ -78,8 +79,8 @@ class Element;
		} // namespace mozilla

		#define NS_IDOCUMENT_IID \
		{ 0xbd70ee06, 0x2a7d, 0x4258, \
		{ 0x86, 0x4b, 0xbd, 0x28, 0xad, 0x9f, 0xd1, 0x41 } }
		{ 0xdb888523, 0x541f, 0x49e3, \
		{ 0xa9, 0x71, 0xb5, 0xea, 0xd1, 0xf0, 0xc3, 0xcf } }

		// Flag for AddStyleSheet().
		#define NS_STYLESHEET_FROM_CATALOG (1 << 0)
		@@ -585,6 +586,13 @@ public:
		return mCSSLoader;
		}

		/**
		* Get this document's StyleImageLoader. This is guaranteed to not return null.
		*/
		mozilla::css::ImageLoader* StyleImageLoader() const {
		return mStyleImageLoader;
		}

		/**
		* Get the channel that was passed to StartDocumentLoad or Reset for this
		* document. Note that this may be null in some cases (eg if
		@@ -1739,6 +1747,7 @@ protected:
		// We hold a strong reference to mNodeInfoManager through mNodeInfo
		nsNodeInfoManager* mNodeInfoManager; // [STRONG]
		nsRefPtr<mozilla::css::Loader> mCSSLoader;
		mozilla::css::ImageLoader* mStyleImageLoader; // [STRONG]
		nsHTMLStyleSheet* mAttrStyleSheet;

		// The set of all object, embed, applet, video and audio elements for

+1 −6

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ interface nsIFrame;
		* sufficient, when combined with the imageBlockingStatus information.)
		*/

		[scriptable, uuid(f7debb84-2854-4731-a57b-1bd752ad71f8)]
		[scriptable, uuid(4bf1a7c5-6edb-4191-a257-e31a90f6aa85)]
		interface nsIImageLoadingContent : imgIDecoderObserver
		{
		/**
		@@ -156,9 +156,4 @@ interface nsIImageLoadingContent : imgIDecoderObserver
		* as PR_FALSE to revert ImageState() to its original behaviour.
		*/
		void forceImageState(in boolean aForce, in unsigned long long aState);

		/**
		* We need to be notified when our document changes.
		*/
		[noscript, notxpcom] void NotifyOwnerDocumentChanged(in nsIDocument aOldDoc);
		};

+16 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ class Element;
		} // namespace mozilla

		#define NS_IMUTATION_OBSERVER_IID \
		{ 0x85eea794, 0xed8e, 0x4e1b, \
		{ 0xa1, 0x28, 0xd0, 0x93, 0x00, 0xae, 0x51, 0xaa } }
		{ 0x16fe5e3e, 0xeadc, 0x4312, \
		{ 0x9d, 0x44, 0xb6, 0xbe, 0xdd, 0x6b, 0x54, 0x74 } }

		/**
		* Information details about a characterdata change. Basically, we
		@@ -192,6 +192,20 @@ public:
		nsIAtom* aAttribute,
		PRInt32 aModType) = 0;

		/**
		* Notification that an attribute of an element has been
		* set to the value it already had.
		*
		* @param aDocument The owner-document of aContent.
		* @param aElement The element whose attribute changed
		* @param aNameSpaceID The namespace id of the changed attribute
		* @param aAttribute The name of the changed attribute
		*/
		virtual void AttributeSetToCurrentValue(nsIDocument* aDocument,
		mozilla::dom::Element* aElement,
		PRInt32 aNameSpaceID,
		nsIAtom* aAttribute) {}

		/**
		* Notification that one or more content nodes have been appended to the
		* child list of another node in the tree.

+15 −0

Original line number	Diff line number	Diff line
		@@ -1672,6 +1672,21 @@ extern const nsIID kThisPtrOffsetsSID;
		NS_OFFSET_AND_INTERFACE_TABLE_END \
		NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE

		#define NS_NODE_INTERFACE_TABLE9(_class, _i1, _i2, _i3, _i4, _i5, _i6, _i7, \
		_i8, _i9) \
		NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(_class) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i2) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i3) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i4) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i5) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i6) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i7) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i8) \
		NS_INTERFACE_TABLE_ENTRY(_class, _i9) \
		NS_OFFSET_AND_INTERFACE_TABLE_END \
		NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE


		NS_DEFINE_STATIC_IID_ACCESSOR(nsINode, NS_INODE_IID)