Changeset 145353 in webkit

Timestamp:

Mar 11, 2013 3:44:33 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[V8] Fix V8InjectedScriptManager
​https://bugs.webkit.org/show_bug.cgi?id=111968

Patch by Marja Hölttä <​marja@chromium.org> on 2013-03-11
Reviewed by Kentaro Hara.

This is needed to make the inspector work after templates for main world
and non-main worlds are separated (bug 111724).

No new tests (no changes in functionality).

• bindings/v8/custom/V8InjectedScriptManager.cpp:

(WebCore::InjectedScriptManager::canAccessInspectedWindow):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Marja Hölttä  <marja@chromium.org>
+
+        [V8] Fix V8InjectedScriptManager
+        https://bugs.webkit.org/show_bug.cgi?id=111968
+
+        Reviewed by Kentaro Hara.
+
+        This is needed to make the inspector work after templates for main world
+        and non-main worlds are separated (bug 111724).
+
+        No new tests (no changes in functionality).
+
+        * bindings/v8/custom/V8InjectedScriptManager.cpp:
+        (WebCore::InjectedScriptManager::canAccessInspectedWindow):
+
 2013-03-11  Hayato Ito  <hayato@chromium.org>
 

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

@@ -121 +121 @@
     v8::Handle<v8::Object> holder = global->FindInstanceInPrototypeChain(V8DOMWindow::GetTemplate(context->GetIsolate(), MainWorld));
     if (holder.IsEmpty())
+        holder = global->FindInstanceInPrototypeChain(V8DOMWindow::GetTemplate(context->GetIsolate(), IsolatedWorld));
+    if (holder.IsEmpty())
         return false;
     Frame* frame = V8DOMWindow::toNative(holder)->frame();