Title: [97258] trunk/Source/WebCore
- Revision
- 97258
- Author
- [email protected]
- Date
- 2011-10-12 06:48:03 -0700 (Wed, 12 Oct 2011)
Log Message
[Chromium] Web Inspector: assertion failure when evaluating _expression_ in worker inspector console
https://bugs.webkit.org/show_bug.cgi?id=69922
Check that the global object is a DOMWindow wrapper befor casting it to V8DOMWindow.
Reviewed by Pavel Feldman.
* bindings/v8/ScriptState.cpp:
(WebCore::ScriptState::domWindow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97257 => 97258)
--- trunk/Source/WebCore/ChangeLog 2011-10-12 13:31:03 UTC (rev 97257)
+++ trunk/Source/WebCore/ChangeLog 2011-10-12 13:48:03 UTC (rev 97258)
@@ -1,3 +1,15 @@
+2011-10-12 Yury Semikhatsky <[email protected]>
+
+ [Chromium] Web Inspector: assertion failure when evaluating _expression_ in worker inspector console
+ https://bugs.webkit.org/show_bug.cgi?id=69922
+
+ Check that the global object is a DOMWindow wrapper befor casting it to V8DOMWindow.
+
+ Reviewed by Pavel Feldman.
+
+ * bindings/v8/ScriptState.cpp:
+ (WebCore::ScriptState::domWindow):
+
2011-10-12 Yuta Kitamura <[email protected]>
WebSocket: Update WebSocket protocol to hybi-17
Modified: trunk/Source/WebCore/bindings/v8/ScriptState.cpp (97257 => 97258)
--- trunk/Source/WebCore/bindings/v8/ScriptState.cpp 2011-10-12 13:31:03 UTC (rev 97257)
+++ trunk/Source/WebCore/bindings/v8/ScriptState.cpp 2011-10-12 13:48:03 UTC (rev 97258)
@@ -63,6 +63,8 @@
{
v8::HandleScope handleScope;
v8::Handle<v8::Object> v8RealGlobal = v8::Handle<v8::Object>::Cast(m_context->Global()->GetPrototype());
+ if (!V8DOMWrapper::isWrapperOfType(v8RealGlobal, &V8DOMWindow::info))
+ return 0;
return V8DOMWindow::toNative(v8RealGlobal);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
