Backed out changeset 8fa0cbe4a54d (bug 817194) for build failures

content/base/src/nsDOMMutationObserver.cpp

@@ -526,11 +526,11 @@ nsDOMMutationObserver::TakeRecords(
 }
 
 void
-nsDOMMutationObserver::GetObservingInfo(nsTArray<Nullable<MutationObservingInfo> >& aResult)
+nsDOMMutationObserver::GetObservingInfo(nsTArray<Nullable<MutationObservingInfoInitializer> >& aResult)
 {
   aResult.SetCapacity(mReceivers.Count());
   for (int32_t i = 0; i < mReceivers.Count(); ++i) {
-    MutationObservingInfo& info = aResult.AppendElement()->SetValue();
+    MutationObservingInfoInitializer& info = aResult.AppendElement()->SetValue();
     nsMutationReceiver* mr = mReceivers[i];
     info.mChildList = mr->ChildList();
     info.mAttributes = mr->Attributes();

content/base/src/nsDOMMutationObserver.h

@@ -26,7 +26,7 @@
 #include "nsIDocument.h"
 
 class nsDOMMutationObserver;
-using mozilla::dom::MutationObservingInfo;
+using mozilla::dom::MutationObservingInfoInitializer;
 
 class nsDOMMutationRecord : public nsISupports,
                             public nsWrapperCache
@@ -379,7 +379,7 @@ public:
 
   void HandleMutation();
 
-  void GetObservingInfo(nsTArray<Nullable<MutationObservingInfo> >& aResult);
+  void GetObservingInfo(nsTArray<Nullable<MutationObservingInfoInitializer> >& aResult);
 
   mozilla::dom::MutationCallback* MutationCallback() { return mCallback; }
 

content/canvas/src/WebGLContext.cpp

@@ -911,7 +911,7 @@ WebGLContext::GetCanvasLayer(nsDisplayListBuilder* aBuilder,
 }
 
 void
-WebGLContext::GetContextAttributes(Nullable<dom::WebGLContextAttributes> &retval)
+WebGLContext::GetContextAttributes(Nullable<dom::WebGLContextAttributesInitializer> &retval)
 {
     retval.SetNull();
     if (IsContextLost())

content/canvas/src/WebGLContext.h

@@ -76,6 +76,7 @@ namespace dom {
 class ImageData;
 
 struct WebGLContextAttributes;
+struct WebGLContextAttributesInitializer;
 template<typename> struct Nullable;
 }
 
@@ -257,7 +258,7 @@ public:
     GLsizei DrawingBufferWidth() const { return IsContextLost() ? 0 : mWidth; }
     GLsizei DrawingBufferHeight() const { return IsContextLost() ? 0 : mHeight; }
 
-    void GetContextAttributes(dom::Nullable<dom::WebGLContextAttributes>& retval);
+    void GetContextAttributes(dom::Nullable<dom::WebGLContextAttributesInitializer>& retval);
     bool IsContextLost() const { return mContextStatus != ContextNotLost; }
     void GetSupportedExtensions(JSContext *cx, dom::Nullable< nsTArray<nsString> > &retval);
     JSObject* GetExtension(JSContext* cx, const nsAString& aName, ErrorResult& rv);

content/media/MediaRecorder.cpp

@@ -492,7 +492,7 @@ MediaRecorder::CreateAndDispatchBlobEvent(Session *aSession)
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
-  BlobEventInit init;
+  BlobEventInitInitializer init;
   init.mBubbles = false;
   init.mCancelable = false;
   init.mData = aSession->GetEncodedData();

content/media/webspeech/recognition/SpeechRecognition.cpp

@@ -713,7 +713,7 @@ SpeechRecognition::Start(ErrorResult& aRv)
   NS_ENSURE_SUCCESS_VOID(rv);
 
   AutoSafeJSContext cx;
-  MediaStreamConstraints constraints;
+  MediaStreamConstraintsInitializer constraints;
   constraints.mAudio.SetAsBoolean() = true;
 
   if (!mTestConfig.mFakeFSMEvents) {

dom/base/nsGlobalWindow.cpp

@@ -4999,7 +4999,7 @@ nsGlobalWindow::DispatchResizeEvent(const nsIntSize& aSize)
 
   AutoSafeJSContext cx;
   JSAutoCompartment ac(cx, mJSObject);
-  DOMWindowResizeEventDetail detail;
+  DOMWindowResizeEventDetailInitializer detail;
   detail.mWidth = aSize.width;
   detail.mHeight = aSize.height;
   JS::Rooted<JS::Value> detailValue(cx);

dom/bindings/Codegen.py

@@ -3544,13 +3544,9 @@ for (uint32_t i = 0; i < length; ++i) {
         assert not isOptional
 
         typeName = CGDictionary.makeDictionaryName(type.inner)
-        if not isMember:
+        actualTypeName = typeName
-            # Since we're not a member and not nullable or optional, no one will
-            # see our real type, so we can do the fast version of the dictionary
-            # that doesn't pre-initialize members.
-            typeName = "detail::Fast" + typeName
 
-        declType = CGGeneric(typeName)
+        declType = CGGeneric(actualTypeName)
 
         # We do manual default value handling here, because we
         # actually do want a jsval, and we only handle null anyway
@@ -4428,7 +4424,8 @@ def getRetvalDeclarationForType(returnType, descriptorProvider,
         return result, True, rooter, None
     if returnType.isDictionary():
         nullable = returnType.nullable()
-        dictName = CGDictionary.makeDictionaryName(returnType.unroll().inner)
+        dictName = (CGDictionary.makeDictionaryName(returnType.unroll().inner) +
+                    "Initializer")
         result = CGGeneric(dictName)
         if not isMember and typeNeedsRooting(returnType):
             if nullable:
@@ -8382,20 +8379,7 @@ if (""",
                                visibility="public",
                                body=self.getMemberInitializer(m))
                    for m in self.memberInfo]
-        ctors = [
+        ctors = [ClassConstructor([], bodyInHeader=True, visibility="public")]
-            ClassConstructor(
-                [],
-                visibility="public",
-                body=(
-                    "// Safe to pass a null context if we pass a null value\n"
-                    "Init(nullptr, JS::NullHandleValue);")),
-            ClassConstructor(
-                [Argument("int", "")],
-                visibility="protected",
-                explicit=True,
-                bodyInHeader=True,
-                body='// Do nothing here; this is used by our "Fast" subclass')
-            ]
         methods = []
 
         if self.needToInitIds:
@@ -8429,23 +8413,17 @@ if (""",
             disallowCopyConstruction=disallowCopyConstruction)
 
 
-        fastDictionaryCtor = ClassConstructor(
+        initializerCtor = ClassConstructor([],
-            [],
             visibility="public",
-            bodyInHeader=True,
+            body=(
-            baseConstructors=["%s(42)" % selfName],
+                "// Safe to pass a null context if we pass a null value\n"
-            body="// Doesn't matter what int we pass to the parent constructor"
+                "Init(nullptr, JS::NullHandleValue);"))
-            )
+        initializerStruct = CGClass(selfName + "Initializer",
-
-        fastStruct = CGClass("Fast" + selfName,
             bases=[ClassBase(selfName)],
-            constructors=[fastDictionaryCtor],
+            constructors=[initializerCtor],
             isStruct=True)
 
-        return CGList([struct,
+        return CGList([struct, initializerStruct])
-                       CGNamespace.build(['detail'],
-                                         fastStruct)],
-                      "\n")
 
     def deps(self):
         return self.dictionary.getDeps()

dom/bindings/test/TestBindingHeader.h

@@ -587,7 +587,7 @@ public:
   // Dictionary tests
   void PassDictionary(JSContext*, const Dict&);
   void ReceiveDictionary(JSContext*, Dict&);
-  void ReceiveNullableDictionary(JSContext*, Nullable<Dict>&);
+  void ReceiveNullableDictionary(JSContext*, Nullable<DictInitializer>&);
   void PassOtherDictionary(const GrandparentDict&);
   void PassSequenceOfDictionaries(JSContext*, const Sequence<Dict>&);
   void PassDictionaryOrLong(JSContext*, const Dict&);

dom/browser-element/BrowserElementParent.cpp

@@ -134,7 +134,7 @@ BrowserElementParent::DispatchOpenWindowEvent(Element* aOpenerFrameElement,
   // aFeatures.
 
   // Create the event's detail object.
-  OpenWindowEventDetail detail;
+  OpenWindowEventDetailInitializer detail;
   detail.mUrl = aURL;
   detail.mName = aName;
   detail.mFeatures = aFeatures;
@@ -307,7 +307,7 @@ NS_IMETHODIMP DispatchAsyncScrollEventRunnable::Run()
   NS_ENSURE_TRUE(globalObject, NS_ERROR_UNEXPECTED);
 
   // Create the event's detail object.
-  AsyncScrollEventDetail detail;
+  AsyncScrollEventDetailInitializer detail;
   detail.mLeft = mContentRect.x;
   detail.mTop = mContentRect.y;
   detail.mWidth = mContentRect.width;

dom/gamepad/GamepadService.cpp

@@ -244,7 +244,7 @@ GamepadService::FireButtonEvent(EventTarget* aTarget,
 {
   nsString name = aValue == 1.0L ? NS_LITERAL_STRING("gamepadbuttondown") :
                                    NS_LITERAL_STRING("gamepadbuttonup");
-  GamepadButtonEventInit init;
+  GamepadButtonEventInitInitializer init;
   init.mBubbles = false;
   init.mCancelable = false;
   init.mGamepad = aGamepad;
@@ -307,7 +307,7 @@ GamepadService::FireAxisMoveEvent(EventTarget* aTarget,
                                   uint32_t aAxis,
                                   double aValue)
 {
-  GamepadAxisMoveEventInit init;
+  GamepadAxisMoveEventInitInitializer init;
   init.mBubbles = false;
   init.mCancelable = false;
   init.mGamepad = aGamepad;
@@ -388,7 +388,7 @@ GamepadService::FireConnectionEvent(EventTarget* aTarget,
 {
   nsString name = aConnected ? NS_LITERAL_STRING("gamepadconnected") :
                                NS_LITERAL_STRING("gamepaddisconnected");
-  GamepadEventInit init;
+  GamepadEventInitInitializer init;
   init.mBubbles = false;
   init.mCancelable = false;
   init.mGamepad = aGamepad;

dom/system/nsDeviceSensors.cpp

@@ -239,7 +239,7 @@ void
 nsDeviceSensors::FireDOMLightEvent(mozilla::dom::EventTarget* aTarget,
                                    double aValue)
 {
-  DeviceLightEventInit init;
+  DeviceLightEventInitInitializer init;
   init.mBubbles = true;
   init.mCancelable = false;
   init.mValue = aValue;
@@ -258,7 +258,7 @@ nsDeviceSensors::FireDOMProximityEvent(mozilla::dom::EventTarget* aTarget,
                                        double aMin,
                                        double aMax)
 {
-  DeviceProximityEventInit init;
+  DeviceProximityEventInitInitializer init;
   init.mBubbles = true;
   init.mCancelable = false;
   init.mValue = aValue;
@@ -289,7 +289,7 @@ void
 nsDeviceSensors::FireDOMUserProximityEvent(mozilla::dom::EventTarget* aTarget,
                                            bool aNear)
 {
-  UserProximityEventInit init;
+  UserProximityEventInitInitializer init;
   init.mBubbles = true;
   init.mCancelable = false;
   init.mNear = aNear;