Changeset 62962 in webkit

Timestamp:

Jul 9, 2010 10:06:04 AM (14 years ago)

Author:

vitalyr@chromium.org

Message:

2010-07-09 Vitaly Repeshko <​vitalyr@chromium.org>

Reviewed by Pavel Feldman.

[v8] Call JS gc in a fresh context to avoid retaining the current one.
​https://bugs.webkit.org/show_bug.cgi?id=41963
​http://crbug.com/46571

• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::collectGarbage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-09  Vitaly Repeshko  <vitalyr@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [v8] Call JS gc in a fresh context to avoid retaining the current one.
+        https://bugs.webkit.org/show_bug.cgi?id=41963
+        http://crbug.com/46571
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::collectGarbage):
+
 2010-07-09  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/bindings/v8/ScriptController.cpp

@@ -291 +291 @@
 {
     v8::HandleScope handleScope;
-    v8::Handle<v8::Context> v8Context = V8Proxy::mainWorldContext(m_proxy->frame());
+
+    v8::Persistent<v8::Context> v8Context = v8::Context::New();
     if (v8Context.IsEmpty())
         return;
-
-    v8::Context::Scope scope(v8Context);
-
-    m_proxy->evaluate(ScriptSourceCode("if (window.gc) void(gc());"), 0);
+    {
+        v8::Context::Scope scope(v8Context);
+        v8::Local<v8::String> source = v8::String::New("if (gc) gc();");
+        v8::Local<v8::String> name = v8::String::New("gc");
+        v8::Handle<v8::Script> script = v8::Script::Compile(source, name);
+        if (!script.IsEmpty())
+            script->Run();
+    }
+    v8Context.Dispose();
 }