Backed out changeset b33a9a88daa6 (bug 933378)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 16 Jul 2016 10:03:09 +0200
changeset 330270 4a25ec78baeb22a3a2f1861eb40d05a97dc5702c
parent 330269 a795d0003a443bf30b7d0b169d0913aee4b46ade
child 330271 8d50699deac13afab27328b99b8ec4ed2a2c5f59
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs933378
milestone50.0a1
backs outb33a9a88daa6663ffbfa84ce5478ddcce898f3d9
Backed out changeset b33a9a88daa6 (bug 933378)
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -133,25 +133,17 @@ using namespace mozilla::dom;
 
 typedef PCObserverString ObString;
 
 static const char* logTag = "PeerConnectionImpl";
 
 
 // Getting exceptions back down from PCObserver is generally not harmful.
 namespace {
-// This is a terrible hack.  The problem is that SuppressException is not
-// inline, and we link this file without libxul in some cases (e.g. for our test
-// setup).  So we can't use ErrorResult or IgnoredErrorResult because those call
-// SuppressException...  And we can't use FastErrorResult because we can't
-// include BindingUtils.h, because our linking is completely fucked up.  Use
-// BaseErrorResult directly.  Please do not let me see _anyone_ doing this
-// without really careful review from someone who knows what they are doing.
-class JSErrorResult :
-    public binding_danger::TErrorResult<binding_danger::JustAssertCleanupPolicy>
+class JSErrorResult : public ErrorResult
 {
 public:
   ~JSErrorResult()
   {
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
     SuppressException();
 #endif
   }
@@ -172,17 +164,16 @@ public:
   WrappableJSErrorResult() : isCopy(false) {}
   WrappableJSErrorResult(const WrappableJSErrorResult &other) : mRv(), isCopy(true) {}
   ~WrappableJSErrorResult() {
     if (isCopy) {
       MOZ_ASSERT(NS_IsMainThread());
     }
   }
   operator JSErrorResult &() { return mRv; }
-  operator ErrorResult &() { return mRv; }
 private:
   JSErrorResult mRv;
   bool isCopy;
 };
 }
 
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
 static nsresult InitNSSInContent()