Changeset 117728 in webkit

Timestamp:

May 20, 2012 10:42:25 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Pass Isolate to throwError()s in bindings/v8/*.{h,cpp}
​https://bugs.webkit.org/show_bug.cgi?id=86977

Reviewed by Adam Barth.

The objective is to pass Isolate around in V8 bindings.
This patch passes Isolate to throwError()s in bindings/v8/*.{h,cpp}
except for a couple of non-trivial cases. I'll upload a follow-up patch
for the non-trivial cases.

No tests. No change in behavior.

• bindings/v8/DateExtension.cpp:

(WebCore::DateExtension::OnSleepDetected):

• bindings/v8/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::transferArrayBuffers):
(WebCore::SerializedScriptValue::SerializedScriptValue):

• bindings/v8/SerializedScriptValue.h:
• bindings/v8/V8NPObject.cpp:

(WebCore::npObjectInvokeImpl):
(WebCore::npObjectPropertyEnumerator):

• bindings/v8/V8Proxy.cpp:

(WebCore::V8Proxy::checkNewLegal):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/DateExtension.cpp (modified) (1 diff)
• bindings/v8/SerializedScriptValue.cpp (modified) (4 diffs)
• bindings/v8/SerializedScriptValue.h (modified) (1 diff)
• bindings/v8/V8NPObject.cpp (modified) (4 diffs)
• bindings/v8/V8Proxy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-20  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Pass Isolate to throwError()s in bindings/v8/*.{h,cpp}
+        https://bugs.webkit.org/show_bug.cgi?id=86977
+
+        Reviewed by Adam Barth.
+
+        The objective is to pass Isolate around in V8 bindings.
+        This patch passes Isolate to throwError()s in bindings/v8/*.{h,cpp}
+        except for a couple of non-trivial cases. I'll upload a follow-up patch
+        for the non-trivial cases.
+
+        No tests. No change in behavior.
+
+        * bindings/v8/DateExtension.cpp:
+        (WebCore::DateExtension::OnSleepDetected):
+        * bindings/v8/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::transferArrayBuffers):
+        (WebCore::SerializedScriptValue::SerializedScriptValue):
+        * bindings/v8/SerializedScriptValue.h:
+        * bindings/v8/V8NPObject.cpp:
+        (WebCore::npObjectInvokeImpl):
+        (WebCore::npObjectPropertyEnumerator):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::checkNewLegal):
+
 2012-05-20  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/bindings/v8/DateExtension.cpp

@@ -117 +117 @@
 }
 
-v8::Handle<v8::Value> DateExtension::OnSleepDetected(const v8::Arguments&)
+v8::Handle<v8::Value> DateExtension::OnSleepDetected(const v8::Arguments& args)
 {
-    V8Proxy::throwError(V8Proxy::GeneralError, "Too much time spent in unload handler.");
+    V8Proxy::throwError(V8Proxy::GeneralError, "Too much time spent in unload handler.", args.GetIsolate());
     return v8::Undefined();
 }

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.cpp

@@ -2155 +2155 @@
 }
 
-PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::transferArrayBuffers(ArrayBufferArray& arrayBuffers, bool& didThrow) 
+PassOwnPtr<SerializedScriptValue::ArrayBufferContentsArray> SerializedScriptValue::transferArrayBuffers(ArrayBufferArray& arrayBuffers, bool& didThrow, v8::Isolate* isolate)
 {
     for (size_t i = 0; i < arrayBuffers.size(); i++) {
         if (arrayBuffers[i]->isNeutered()) {
-            throwError(INVALID_STATE_ERR);
+            throwError(INVALID_STATE_ERR, isolate);
             didThrow = true;
             return nullptr;
@@ -2177 +2177 @@
         bool result = arrayBuffers[i]->transfer(contents->at(i), neuteredViews);
         if (!result) {
-            throwError(INVALID_STATE_ERR);
+            throwError(INVALID_STATE_ERR, isolate);
             didThrow = true;
             return nullptr;
@@ -2214 +2214 @@
         // of the TryCatch scope.
         didThrow = true;
-        throwError(DATA_CLONE_ERR);
+        throwError(DATA_CLONE_ERR, isolate);
         return;
     case Serializer::InvalidStateError:
         didThrow = true;
-        throwError(INVALID_STATE_ERR);
+        throwError(INVALID_STATE_ERR, isolate);
         return;
     case Serializer::JSFailure:
@@ -2229 +2229 @@
         m_data = String(StringImpl::adopt(writer.data())).isolatedCopy();
         if (arrayBuffers)
-            m_arrayBufferContentsArray = transferArrayBuffers(*arrayBuffers, didThrow);
+            m_arrayBufferContentsArray = transferArrayBuffers(*arrayBuffers, didThrow, isolate);
         return;
     case Serializer::JSException:

trunk/Source/WebCore/bindings/v8/SerializedScriptValue.h

@@ -89 +89 @@
     explicit SerializedScriptValue(const String& wireData);
 
-    static PassOwnPtr<ArrayBufferContentsArray> transferArrayBuffers(ArrayBufferArray&, bool& didThrow);
+    static PassOwnPtr<ArrayBufferContentsArray> transferArrayBuffers(ArrayBufferArray&, bool& didThrow, v8::Isolate*);
 
     String m_data;

trunk/Source/WebCore/bindings/v8/V8NPObject.cpp

@@ -93 +93 @@
         // internal fields.
         if (args.Holder()->InternalFieldCount() != npObjectInternalFieldCount)
-            return V8Proxy::throwError(V8Proxy::ReferenceError, "NPMethod called on non-NPObject");
+            return V8Proxy::throwError(V8Proxy::ReferenceError, "NPMethod called on non-NPObject", args.GetIsolate());
 
         npObject = v8ObjectToNPObject(args.Holder());
@@ -100 +100 @@
     // Verify that our wrapper wasn't using a NPObject which has already been deleted.
     if (!npObject || !_NPN_IsAlive(npObject))
-        return V8Proxy::throwError(V8Proxy::ReferenceError, "NPObject deleted");
+        return V8Proxy::throwError(V8Proxy::ReferenceError, "NPObject deleted", args.GetIsolate());
 
     // Wrap up parameters.
@@ -134 +134 @@
 
     if (!retval)
-        V8Proxy::throwError(V8Proxy::GeneralError, "Error calling method on NPObject.");
+        V8Proxy::throwError(V8Proxy::GeneralError, "Error calling method on NPObject.", args.GetIsolate());
 
     for (int i = 0; i < numArgs; i++)
@@ -326 +326 @@
     // has already been deleted.
     if (!npObject || !_NPN_IsAlive(npObject))
-        V8Proxy::throwError(V8Proxy::ReferenceError, "NPObject deleted");
+        V8Proxy::throwError(V8Proxy::ReferenceError, "NPObject deleted", info.GetIsolate());
 
     if (NP_CLASS_STRUCT_VERSION_HAS_ENUM(npObject->_class) && npObject->_class->enumerate) {

trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

@@ -713 +713 @@
 {
     if (ConstructorMode::current() == ConstructorMode::CreateNewObject)
-        return throwError(TypeError, "Illegal constructor");
+        return throwError(TypeError, "Illegal constructor", args.GetIsolate());
 
     return args.This();