Bug 1110487 P1 Fix some non-unified bustage before adding new code. r=ehsan
authorBen Kelly <ben@wanderview.com>
Mon, 16 Mar 2015 07:10:36 -0700
changeset 264226 94079a10b177ea2a97fbd95067c7571913176c1a
parent 264225 c7f6177f04cfe0c62520ee5ac620b0d79e39e981
child 264227 734e81bff9f3575ffc3422043563fad8d0ddd4aa
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1110487
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1110487 P1 Fix some non-unified bustage before adding new code. r=ehsan
dom/cache/ActorChild.cpp
dom/cache/ActorChild.h
dom/promise/PromiseNativeHandler.h
--- a/dom/cache/ActorChild.cpp
+++ b/dom/cache/ActorChild.cpp
@@ -45,16 +45,20 @@ ActorChild::GetFeature() const
 }
 
 bool
 ActorChild::FeatureNotified() const
 {
   return mFeature && mFeature->Notified();
 }
 
+ActorChild::ActorChild()
+{
+}
+
 ActorChild::~ActorChild()
 {
   MOZ_ASSERT(!mFeature);
 }
 
 } // namespace cache
 } // namespace dom
 } // namespace mozilla
--- a/dom/cache/ActorChild.h
+++ b/dom/cache/ActorChild.h
@@ -29,16 +29,17 @@ public:
 
   Feature*
   GetFeature() const;
 
   bool
   FeatureNotified() const;
 
 protected:
+  ActorChild();
   ~ActorChild();
 
 private:
   nsRefPtr<Feature> mFeature;
 };
 
 } // namespace cache
 } // namespace dom
--- a/dom/promise/PromiseNativeHandler.h
+++ b/dom/promise/PromiseNativeHandler.h
@@ -3,16 +3,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_PromiseNativeHandler_h
 #define mozilla_dom_PromiseNativeHandler_h
 
 #include "nsISupports.h"
+#include "js/TypeDecls.h"
 
 namespace mozilla {
 namespace dom {
 
 /*
  * PromiseNativeHandler allows C++ to react to a Promise being rejected/resolved.
  * A PromiseNativeHandler can be appended to a Promise using
  * Promise::AppendNativeHandler().