Changeset 117733 in webkit

Timestamp:

May 20, 2012 11:28:54 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Pass Isolate to throwError()s in V8 custom bindings (Part 1)
​https://bugs.webkit.org/show_bug.cgi?id=86980

Reviewed by Adam Barth.

The objective is to pass Isolate around in V8 bindings.
This patch passes Isolate to throwError()s in V8 custom bindings.

No tests. No change in behavior.

• bindings/v8/custom/V8ArrayBufferCustom.cpp:

(WebCore::V8ArrayBuffer::constructorCallback):

• bindings/v8/custom/V8ArrayBufferViewCustom.h:

(WebCore::constructWebGLArrayWithArrayBufferArgument):
(WebCore::constructWebGLArray):

• bindings/v8/custom/V8AudioContextCustom.cpp:

(WebCore::V8AudioContext::constructorCallback):

• bindings/v8/custom/V8BlobCustom.cpp:

(WebCore::V8Blob::constructorCallback):

• bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp:

(WebCore::V8CSSStyleDeclaration::namedPropertySetter):

• bindings/v8/custom/V8ClipboardCustom.cpp:

(WebCore::V8Clipboard::clearDataCallback):
(WebCore::V8Clipboard::setDragImageCallback):

• bindings/v8/custom/V8DOMFormDataCustom.cpp:

(WebCore::V8DOMFormData::appendCallback):

• bindings/v8/custom/V8DOMStringMapCustom.cpp:

(WebCore::V8DOMStringMap::namedPropertySetter):

• bindings/v8/custom/V8DOMWindowCustom.cpp:

(WebCore::handlePostMessageCallback):

• bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp:

(WebCore::handlePostMessageCallback):

• bindings/v8/custom/V8DirectoryEntryCustom.cpp:

(WebCore::V8DirectoryEntry::getDirectoryCallback):
(WebCore::V8DirectoryEntry::getFileCallback):

• bindings/v8/custom/V8DocumentCustom.cpp:

(WebCore::V8Document::evaluateCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8ArrayBufferCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8ArrayBufferViewCustom.h (modified) (2 diffs)
• bindings/v8/custom/V8AudioContextCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8BlobCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8ClipboardCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8DOMFormDataCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DOMStringMapCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DirectoryEntryCustom.cpp (modified) (4 diffs)
• bindings/v8/custom/V8DocumentCustom.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-20  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Pass Isolate to throwError()s in V8 custom bindings (Part 1)
+        https://bugs.webkit.org/show_bug.cgi?id=86980
+
+        Reviewed by Adam Barth.
+
+        The objective is to pass Isolate around in V8 bindings.
+        This patch passes Isolate to throwError()s in V8 custom bindings.
+
+        No tests. No change in behavior.
+
+        * bindings/v8/custom/V8ArrayBufferCustom.cpp:
+        (WebCore::V8ArrayBuffer::constructorCallback):
+        * bindings/v8/custom/V8ArrayBufferViewCustom.h:
+        (WebCore::constructWebGLArrayWithArrayBufferArgument):
+        (WebCore::constructWebGLArray):
+        * bindings/v8/custom/V8AudioContextCustom.cpp:
+        (WebCore::V8AudioContext::constructorCallback):
+        * bindings/v8/custom/V8BlobCustom.cpp:
+        (WebCore::V8Blob::constructorCallback):
+        * bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp:
+        (WebCore::V8CSSStyleDeclaration::namedPropertySetter):
+        * bindings/v8/custom/V8ClipboardCustom.cpp:
+        (WebCore::V8Clipboard::clearDataCallback):
+        (WebCore::V8Clipboard::setDragImageCallback):
+        * bindings/v8/custom/V8DOMFormDataCustom.cpp:
+        (WebCore::V8DOMFormData::appendCallback):
+        * bindings/v8/custom/V8DOMStringMapCustom.cpp:
+        (WebCore::V8DOMStringMap::namedPropertySetter):
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::handlePostMessageCallback):
+        * bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp:
+        (WebCore::handlePostMessageCallback):
+        * bindings/v8/custom/V8DirectoryEntryCustom.cpp:
+        (WebCore::V8DirectoryEntry::getDirectoryCallback):
+        (WebCore::V8DirectoryEntry::getFileCallback):
+        * bindings/v8/custom/V8DocumentCustom.cpp:
+        (WebCore::V8Document::evaluateCallback):
+
 2012-05-20  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/bindings/v8/custom/V8ArrayBufferCustom.cpp

@@ -71 +71 @@
         buffer = ArrayBuffer::create(static_cast<unsigned>(length), 1);
     if (!buffer.get())
-        return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBuffer size is not a small enough positive integer.");
+        return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBuffer size is not a small enough positive integer.", args.GetIsolate());
     // Transform the holder into a wrapper object for the array.
     V8DOMWrapper::setDOMWrapper(args.Holder(), &info, buffer.get());

trunk/Source/WebCore/bindings/v8/custom/V8ArrayBufferViewCustom.h

@@ -77 +77 @@
     } else {
         if ((buf->byteLength() - offset) % sizeof(ElementType))
-            return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBuffer length minus the byteOffset is not a multiple of the element size.");
+            return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBuffer length minus the byteOffset is not a multiple of the element size.", args.GetIsolate());
         length = (buf->byteLength() - offset) / sizeof(ElementType);
     }
@@ -170 +170 @@
         array = ArrayClass::create(len);
     if (!array.get())
-        return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBufferView size is not a small enough positive integer.");
+        return V8Proxy::throwError(V8Proxy::RangeError, "ArrayBufferView size is not a small enough positive integer.", args.GetIsolate());
 
 

trunk/Source/WebCore/bindings/v8/custom/V8AudioContextCustom.cpp

@@ -52 +52 @@
     Frame* frame = V8Proxy::retrieveFrameForCurrentContext();
     if (!frame)
-        return V8Proxy::throwError(V8Proxy::ReferenceError, "AudioContext constructor associated frame is unavailable");
+        return V8Proxy::throwError(V8Proxy::ReferenceError, "AudioContext constructor associated frame is unavailable", args.GetIsolate());
 
     Document* document = frame->document();
     if (!document)
-        return V8Proxy::throwError(V8Proxy::ReferenceError, "AudioContext constructor associated document is unavailable");
+        return V8Proxy::throwError(V8Proxy::ReferenceError, "AudioContext constructor associated document is unavailable", args.GetIsolate());
 
     RefPtr<AudioContext> audioContext;
@@ -65 +65 @@
         audioContext = AudioContext::create(document, ec);
         if (ec)
-            return throwError(ec);
+            return throwError(ec, args.GetIsolate());
         if (!audioContext.get())
-            return V8Proxy::throwError(V8Proxy::SyntaxError, "audio resources unavailable for AudioContext construction");
+            return V8Proxy::throwError(V8Proxy::SyntaxError, "audio resources unavailable for AudioContext construction", args.GetIsolate());
     } else {
         // Constructor for offline (render-target) AudioContext which renders into an AudioBuffer.
@@ -78 +78 @@
         int32_t numberOfChannels = toInt32(args[0], ok);
         if (!ok || numberOfChannels <= 0 || numberOfChannels > 10)
-            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid number of channels");
+            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid number of channels", args.GetIsolate());
 
         int32_t numberOfFrames = toInt32(args[1], ok);
         if (!ok || numberOfFrames <= 0)
-            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid number of frames");
+            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid number of frames", args.GetIsolate());
 
         float sampleRate = toFloat(args[2]);
         if (sampleRate <= 0)
-            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid sample rate");
+            return V8Proxy::throwError(V8Proxy::SyntaxError, "Invalid sample rate", args.GetIsolate());
 
         ExceptionCode ec = 0;
         audioContext = AudioContext::createOfflineContext(document, numberOfChannels, numberOfFrames, sampleRate, ec);
         if (ec)
-            return throwError(ec);
+            return throwError(ec, args.GetIsolate());
     }
 
     if (!audioContext.get())
-        return V8Proxy::throwError(V8Proxy::SyntaxError, "Error creating AudioContext");
+        return V8Proxy::throwError(V8Proxy::SyntaxError, "Error creating AudioContext", args.GetIsolate());
     
     // Transform the holder into a wrapper object for the audio context.

trunk/Source/WebCore/bindings/v8/custom/V8BlobCustom.cpp

@@ -69 +69 @@
     ScriptExecutionContext* context = getScriptExecutionContext();
     if (!context)
-        return V8Proxy::throwError(V8Proxy::ReferenceError, "Blob constructor associated document is unavailable");
+        return V8Proxy::throwError(V8Proxy::ReferenceError, "Blob constructor associated document is unavailable", args.GetIsolate());
 
     if (!args.Length()) {
@@ -92 +92 @@
         bool containsEndings = dictionary.get("endings", endings);
         if (tryCatchEndings.HasCaught())
-            return throwError(tryCatchEndings.Exception());
+            return throwError(tryCatchEndings.Exception(), args.GetIsolate());
 
         if (containsEndings) {
@@ -102 +102 @@
         dictionary.get("type", type);
         if (tryCatchType.HasCaught())
-            return throwError(tryCatchType.Exception());
+            return throwError(tryCatchType.Exception(), args.GetIsolate());
     }
 

trunk/Source/WebCore/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp

@@ -239 +239 @@
 
     if (ec)
-        throwError(ec);
+        throwError(ec, info.GetIsolate());
 
     return value;

trunk/Source/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp

@@ -74 +74 @@
 
     if (args.Length() != 1)
-        return V8Proxy::throwError(V8Proxy::SyntaxError, "clearData: Invalid number of arguments");
+        return V8Proxy::throwError(V8Proxy::SyntaxError, "clearData: Invalid number of arguments", args.GetIsolate());
 
     String type = toWebCoreString(args[0]);
@@ -90 +90 @@
 
     if (args.Length() != 3)
-        return V8Proxy::throwError(V8Proxy::SyntaxError, "setDragImage: Invalid number of arguments");
+        return V8Proxy::throwError(V8Proxy::SyntaxError, "setDragImage: Invalid number of arguments", args.GetIsolate());
 
     int x = toInt32(args[1]);

trunk/Source/WebCore/bindings/v8/custom/V8DOMFormDataCustom.cpp

@@ -66 +66 @@
     
     if (args.Length() < 2)
-        return V8Proxy::throwError(V8Proxy::SyntaxError, "Not enough arguments");
+        return V8Proxy::throwError(V8Proxy::SyntaxError, "Not enough arguments", args.GetIsolate());
 
     DOMFormData* domFormData = V8DOMFormData::toNative(args.Holder());

trunk/Source/WebCore/bindings/v8/custom/V8DOMStringMapCustom.cpp

@@ -81 +81 @@
     V8DOMStringMap::toNative(info.Holder())->setItem(toWebCoreString(name), toWebCoreString(value), ec);
     if (ec)
-        return throwError(ec);
+        return throwError(ec, info.GetIsolate());
     return value;
 }

trunk/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -344 +344 @@
     ExceptionCode ec = 0;
     window->postMessage(message.release(), &portArray, targetOrigin, source, ec);
-    return throwError(ec);
+    return throwError(ec, args.GetIsolate());
 }
 

trunk/Source/WebCore/bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp

@@ -64 +64 @@
     ExceptionCode ec = 0;
     workerContext->postMessage(message.release(), &ports, ec);
-    return throwError(ec);
+    return throwError(ec, args.GetIsolate());
 }
 

trunk/Source/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp

@@ -77 +77 @@
     if (args.Length() > 2 && !args[2]->IsNull() && !args[2]->IsUndefined()) {
         if (!args[2]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
+            return throwError(TYPE_MISMATCH_ERR, args.GetIsolate());
         successCallback = V8EntryCallback::create(args[2], getScriptExecutionContext());
     }
@@ -83 +83 @@
     if (args.Length() > 3 && !args[3]->IsNull() && !args[3]->IsUndefined()) {
         if (!args[3]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
+            return throwError(TYPE_MISMATCH_ERR, args.GetIsolate());
         errorCallback = V8ErrorCallback::create(args[3], getScriptExecutionContext());
     }
@@ -121 +121 @@
     if (args.Length() > 2 && !args[2]->IsNull() && !args[2]->IsUndefined()) {
         if (!args[2]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
+            return throwError(TYPE_MISMATCH_ERR, args.GetIsolate());
         successCallback = V8EntryCallback::create(args[2], getScriptExecutionContext());
     }
@@ -127 +127 @@
     if (args.Length() > 3 && !args[3]->IsNull() && !args[3]->IsUndefined()) {
         if (!args[3]->IsObject())
-            return throwError(TYPE_MISMATCH_ERR);
+            return throwError(TYPE_MISMATCH_ERR, args.GetIsolate());
         errorCallback = V8ErrorCallback::create(args[3], getScriptExecutionContext());
     }

trunk/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp

@@ -77 +77 @@
     RefPtr<XPathNSResolver> resolver = V8DOMWrapper::getXPathNSResolver(args[2]);
     if (!resolver && !args[2]->IsNull() && !args[2]->IsUndefined())
-        return throwError(TYPE_MISMATCH_ERR);
+        return throwError(TYPE_MISMATCH_ERR, args.GetIsolate());
 
     int type = toInt32(args[3]);
@@ -87 +87 @@
     RefPtr<XPathResult> result = document->evaluate(expression, contextNode.get(), resolver.get(), type, inResult.get(), ec);
     if (exceptionCatcher.HasCaught())
-        return throwError(exceptionCatcher.Exception());
+        return throwError(exceptionCatcher.Exception(), args.GetIsolate());
 
     if (ec)
-        return throwError(ec);
+        return throwError(ec, args.GetIsolate());
 
     return toV8(result.release(), args.GetIsolate());