Title: [145353] trunk/Source/WebCore
- Revision
- 145353
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-11 03:44:33 -0700 (Mon, 11 Mar 2013)
Log Message
[V8] Fix V8InjectedScriptManager
https://bugs.webkit.org/show_bug.cgi?id=111968
Patch by Marja Hölttä <ma...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145352 => 145353)
--- trunk/Source/WebCore/ChangeLog 2013-03-11 10:36:21 UTC (rev 145352)
+++ trunk/Source/WebCore/ChangeLog 2013-03-11 10:44:33 UTC (rev 145353)
@@ -1,3 +1,18 @@
+2013-03-11 Marja Hölttä <ma...@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 <hay...@chromium.org>
Make sure that CSSSelector::setValue() is never called after parsing its pseudoType.
Modified: trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp (145352 => 145353)
--- trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp 2013-03-11 10:36:21 UTC (rev 145352)
+++ trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptManager.cpp 2013-03-11 10:44:33 UTC (rev 145353)
@@ -120,6 +120,8 @@
return false;
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();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
