webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/JavaScriptCore/runtime/ArrayBuffer.cpp b/Source/JavaScriptCore/runtime/ArrayBuffer.cpp
index 5a7ad268e..2c49b6976 100644
--- a/Source/JavaScriptCore/runtime/ArrayBuffer.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayBuffer.cpp
@@ -28,7 +28,7 @@
 
 #include "ArrayBufferNeuteringWatchpoint.h"
 #include "JSArrayBufferView.h"
-#include "JSCInlines.h"
+#include "Operations.h"
 #include <wtf/RefPtr.h>
 
 namespace JSC {
@@ -44,20 +44,20 @@ bool ArrayBuffer::transfer(ArrayBufferContents& result)
 
     bool isNeuterable = !m_pinCount;
 
-    if (!isNeuterable) {
+    if (isNeuterable)
+        m_contents.transfer(result);
+    else {
         m_contents.copyTo(result);
         if (!result.m_data)
             return false;
-        return true;
     }
 
-    m_contents.transfer(result);
     for (size_t i = numberOfIncomingReferences(); i--;) {
         JSCell* cell = incomingReferenceAt(i);
         if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(cell))
             view->neuter();
         else if (ArrayBufferNeuteringWatchpoint* watchpoint = jsDynamicCast<ArrayBufferNeuteringWatchpoint*>(cell))
-            watchpoint->fireAll();
+            watchpoint->set()->fireAll();
     }
     return true;
 }