Changeset 101490 in webkit

Timestamp:

Nov 30, 2011 4:57:12 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[MutationObservers] V8 bindings don't properly wrap all calls into JS
​https://bugs.webkit.org/show_bug.cgi?id=72063

Patch by Rafael Weinstein <​rafaelw@chromium.org> on 2011-11-30
Reviewed by Adam Barth.

This patch changes cleans up script invocation in V8Proxy. It removes callFunctionWithoutFrame
and changes callers to simply call instrumentedFunctionCall with a null Page. Also, it implements
the non-static callFunction to be implemented in terms of instrumentedFunctionCall.

No new tests.

• bindings/v8/ScriptFunctionCall.cpp:

(WebCore::ScriptCallback::call):

• bindings/v8/V8NodeFilterCondition.cpp:

(WebCore::V8NodeFilterCondition::acceptNode):

• bindings/v8/V8Proxy.cpp:

(WebCore::V8Proxy::callFunction):
(WebCore::V8Proxy::instrumentedCallFunction):

• bindings/v8/V8Proxy.h:
• bindings/v8/custom/V8CustomXPathNSResolver.cpp:

(WebCore::V8CustomXPathNSResolver::lookupNamespaceURI):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptFunctionCall.cpp (modified) (1 diff)
• bindings/v8/V8NodeFilterCondition.cpp (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (3 diffs)
• bindings/v8/V8Proxy.h (modified) (1 diff)
• bindings/v8/custom/V8CustomXPathNSResolver.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-30  Rafael Weinstein  <rafaelw@chromium.org>
+
+        [MutationObservers] V8 bindings don't properly wrap all calls into JS
+        https://bugs.webkit.org/show_bug.cgi?id=72063
+
+        Reviewed by Adam Barth.
+
+        This patch changes cleans up script invocation in V8Proxy. It removes callFunctionWithoutFrame
+        and changes callers to simply call instrumentedFunctionCall with a null Page. Also, it implements
+        the non-static callFunction to be implemented in terms of instrumentedFunctionCall.
+
+        No new tests.
+
+        * bindings/v8/ScriptFunctionCall.cpp:
+        (WebCore::ScriptCallback::call):
+        * bindings/v8/V8NodeFilterCondition.cpp:
+        (WebCore::V8NodeFilterCondition::acceptNode):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::callFunction):
+        (WebCore::V8Proxy::instrumentedCallFunction):
+        * bindings/v8/V8Proxy.h:
+        * bindings/v8/custom/V8CustomXPathNSResolver.cpp:
+        (WebCore::V8CustomXPathNSResolver::lookupNamespaceURI):
+
 2011-11-30  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -198 +198 @@
         args[i] = m_arguments[i].v8Value();
 
-    v8::Handle<v8::Value> result = V8Proxy::callFunctionWithoutFrame(function, object, m_arguments.size(), args.get());
+    v8::Handle<v8::Value> result = V8Proxy::instrumentedCallFunction(0 /* page */, function, object, m_arguments.size(), args.get());
 
     if (exceptionCatcher.HasCaught()) {

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

@@ -84 +84 @@
     args[0] = toV8(node);
 
-    v8::Handle<v8::Value> result = V8Proxy::callFunctionWithoutFrame(callback, object, 1, args.get());
+    v8::Handle<v8::Value> result = V8Proxy::instrumentedCallFunction(0 /* page */, callback, object, 1, args.get());
 
     if (exceptionCatcher.HasCaught()) {

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

@@ -431 +431 @@
 v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
 {
+    // Keep Frame (and therefore ScriptController and V8Proxy) alive.
+    RefPtr<Frame> protect(frame());
+    return V8Proxy::instrumentedCallFunction(m_frame->page(), function, receiver, argc, args);
+}
+
+v8::Local<v8::Value> V8Proxy::instrumentedCallFunction(Page* page, v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
+{
     V8GCController::checkMemoryUsage();
 
@@ -436 +443 @@
         return handleMaxRecursionDepthExceeded();
 
-    // Keep Frame (and therefore ScriptController and V8Proxy) alive.
-    RefPtr<Frame> protect(frame());
-
-    v8::Local<v8::Value> result;
-    {
-        V8RecursionScope recursionScope;
-        result = V8Proxy::instrumentedCallFunction(m_frame->page(), function, receiver, argc, args);
-    }
-
-    didLeaveScriptContext();
-
-    if (v8::V8::IsDead())
-        handleFatalErrorInV8();
-
-    return result;
-}
-
-v8::Local<v8::Value> V8Proxy::callFunctionWithoutFrame(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
-{
-    V8GCController::checkMemoryUsage();
-    v8::Local<v8::Value> result = function->Call(receiver, argc, args);
-
-    if (v8::V8::IsDead())
-        handleFatalErrorInV8();
-
-    return result;
-}
-
-v8::Local<v8::Value> V8Proxy::instrumentedCallFunction(Page* page, v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
-{
     InspectorInstrumentationCookie cookie;
     if (InspectorInstrumentation::hasFrontends()) {
@@ -477 +454 @@
         cookie = InspectorInstrumentation::willCallFunction(page, resourceName, lineNumber);
     }
-    v8::Local<v8::Value> result = function->Call(receiver, argc, args);
+
+    v8::Local<v8::Value> result;
+    {
+        V8RecursionScope recursionScope;
+        result = function->Call(receiver, argc, args);
+    }
+
+    // FIXME: Instrument any work that takes place when script exits to c++ (e.g. Mutation Observers).
+    didLeaveScriptContext();
+
     InspectorInstrumentation::didCallFunction(cookie);
+
+    if (v8::V8::IsDead())
+        handleFatalErrorInV8();
+
     return result;
 }

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

@@ -165 +165 @@
         v8::Local<v8::Value> callFunction(v8::Handle<v8::Function>, v8::Handle<v8::Object>, int argc, v8::Handle<v8::Value> argv[]);
 
-        // Call the function with the given receiver and arguments.
-        static v8::Local<v8::Value> callFunctionWithoutFrame(v8::Handle<v8::Function>, v8::Handle<v8::Object>, int argc, v8::Handle<v8::Value> argv[]);
-
         // call the function with the given receiver and arguments and report times to DevTools.
         static v8::Local<v8::Value> instrumentedCallFunction(Page*, v8::Handle<v8::Function>, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[]);

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

@@ -79 +79 @@
     v8::Handle<v8::Function> function = lookupNamespaceURIFunc.IsEmpty() ? v8::Handle<v8::Function>::Cast(m_resolver) : lookupNamespaceURIFunc;
 
-    v8::Handle<v8::Value> retval = V8Proxy::callFunctionWithoutFrame(function, m_resolver, argc, argv);
+    v8::Handle<v8::Value> retval = V8Proxy::instrumentedCallFunction(0 /* page */, function, m_resolver, argc, argv);
 
     // Eat exceptions from namespace resolver and return an empty string. This will most likely cause NAMESPACE_ERR.