Changeset 100347 in webkit

Timestamp:

Nov 15, 2011 3:34:04 PM (12 years ago)

Author:

adamk@chromium.org

Message:

Factor out V8Proxy's max recursion depth handling code
​https://bugs.webkit.org/show_bug.cgi?id=72422

Reviewed by Nate Chapin.

Previously, V8Proxy used slightly different code to handle stack limit
violations depending on whether they occured in runScript or
callFunction. As described in ​http://webkit.org/b/72063, I intend to
expand the usage of m_recursion when calling into script. This patch
is intended to unify the existing handling code, making it easier to
move elsewhere without causing unintended side-effects.

No tests changed, as the only change in behavior is the string passed
to RangeError in the runScript case, and it's not mentioned anywhere
in the LayoutTests.

• bindings/v8/V8Proxy.cpp:

(WebCore::handleMaxRecursionDepthExceeded):
(WebCore::V8Proxy::runScript): Use callFunction's factored-out code.
(WebCore::V8Proxy::callFunction): Simplify and factor out code into handleMaxRecursionDepthExceeded.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-15  Adam Klein  <adamk@chromium.org>
+
+        Factor out V8Proxy's max recursion depth handling code
+        https://bugs.webkit.org/show_bug.cgi?id=72422
+
+        Reviewed by Nate Chapin.
+
+        Previously, V8Proxy used slightly different code to handle stack limit
+        violations depending on whether they occured in runScript or
+        callFunction. As described in http://webkit.org/b/72063, I intend to
+        expand the usage of m_recursion when calling into script. This patch
+        is intended to unify the existing handling code, making it easier to
+        move elsewhere without causing unintended side-effects.
+
+        No tests changed, as the only change in behavior is the string passed
+        to RangeError in the runScript case, and it's not mentioned anywhere
+        in the LayoutTests.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::handleMaxRecursionDepthExceeded):
+        (WebCore::V8Proxy::runScript): Use callFunction's factored-out code.
+        (WebCore::V8Proxy::callFunction): Simplify and factor out code into handleMaxRecursionDepthExceeded.
+
 2011-11-15  Jessie Berlin  <jberlin@apple.com>
 

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

@@ -176 +176 @@
 }
 
+static v8::Local<v8::Value> handleMaxRecursionDepthExceeded()
+{
+    v8::Local<v8::String> code = v8::String::New("throw new RangeError('Maximum call stack size exceeded.')");
+    v8::Local<v8::Script> script = v8::Script::Compile(code);
+    script->Run();
+    return v8::Local<v8::Value>();
+}
+
 V8Proxy::V8Proxy(Frame* frame)
     : m_frame(frame)
@@ -385 +393 @@
 
     V8GCController::checkMemoryUsage();
-    // Compute the source string and prevent against infinite recursion.
-    if (m_recursion >= kMaxRecursionDepth) {
-        v8::Local<v8::String> code = v8ExternalString("throw RangeError('Recursion too deep')");
-        // FIXME: Ideally, we should be able to re-use the origin of the
-        // script passed to us as the argument instead of using an empty string
-        // and 0 baseLine.
-        script = compileScript(code, "", TextPosition::minimumPosition());
-    }
+    if (m_recursion >= kMaxRecursionDepth)
+        return handleMaxRecursionDepthExceeded();
 
     if (handleOutOfMemory())
         ASSERT(script.IsEmpty());
-
-    if (script.IsEmpty())
-        return notHandledByInterceptor();
 
     // Save the previous value of the inlineCode flag and update the flag for
@@ -446 +445 @@
     V8GCController::checkMemoryUsage();
 
+    if (m_recursion >= kMaxRecursionDepth)
+        return handleMaxRecursionDepthExceeded();
+
     // Keep Frame (and therefore ScriptController and V8Proxy) alive.
     RefPtr<Frame> protect(frame());
@@ -451 +453 @@
     v8::Local<v8::Value> result;
     {
-        if (m_recursion >= kMaxRecursionDepth) {
-            v8::Local<v8::String> code = v8::String::New("throw new RangeError('Maximum call stack size exceeded.')");
-            if (code.IsEmpty())
-                return result;
-            v8::Local<v8::Script> script = v8::Script::Compile(code);
-            if (script.IsEmpty())
-                return result;
-            script->Run();
-            return result;
-        }
-
         m_recursion++;
         result = V8Proxy::instrumentedCallFunction(m_frame->page(), function, receiver, argc, args);