Bug 1167189 - Use a size annotation on the OOM abort. r=bholley, a=lizzard
authorDavid Major <dmajor@mozilla.com>
Tue, 26 May 2015 17:04:24 -0400
changeset 274978 0f82f1286aa7e833d82f1728c1b526b6320cc913
parent 274977 bd3c863e4c0c18cf1561345a5d0f4ea0a4ae377a
child 274979 b407b0f366757b426c6594d8e73d230961531dee
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley, lizzard
bugs1167189
milestone40.0a2
Bug 1167189 - Use a size annotation on the OOM abort. r=bholley, a=lizzard
dom/base/nsFrameMessageManager.cpp
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -2091,17 +2091,17 @@ nsSameProcessAsyncMessageBase::nsSamePro
                                                              JS::Handle<JSObject*> aCpows,
                                                              nsIPrincipal* aPrincipal)
   : mRuntime(js::GetRuntime(aCx)),
     mMessage(aMessage),
     mCpows(aCx, aCpows),
     mPrincipal(aPrincipal)
 {
   if (aData.mDataLength && !mData.copy(aData.mData, aData.mDataLength)) {
-    NS_RUNTIMEABORT("OOM");
+    NS_ABORT_OOM(aData.mDataLength);
   }
   mClosure = aData.mClosure;
 }
 
 void
 nsSameProcessAsyncMessageBase::ReceiveMessage(nsISupports* aTarget,
                                               nsIFrameLoader* aTargetFrameLoader,
                                               nsFrameMessageManager* aManager)