Title: [106722] trunk/Source/WebCore
- Revision
- 106722
- Author
- [email protected]
- Date
- 2012-02-03 17:45:14 -0800 (Fri, 03 Feb 2012)
Log Message
[Chromium] WebCore::toV8Context crashes if DomWindow::frame() returns null.
https://bugs.webkit.org/show_bug.cgi?id=77686.
Reviewed by Adam Barth.
* bindings/v8/V8Helpers.cpp:
(WebCore::toV8Context):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (106721 => 106722)
--- trunk/Source/WebCore/ChangeLog 2012-02-04 01:41:14 UTC (rev 106721)
+++ trunk/Source/WebCore/ChangeLog 2012-02-04 01:45:14 UTC (rev 106722)
@@ -1,3 +1,13 @@
+2012-02-03 Dmitry Lomov <[email protected]>
+
+ [Chromium] WebCore::toV8Context crashes if DomWindow::frame() returns null.
+ https://bugs.webkit.org/show_bug.cgi?id=77686.
+
+ Reviewed by Adam Barth.
+
+ * bindings/v8/V8Helpers.cpp:
+ (WebCore::toV8Context):
+
2012-02-03 Anders Carlsson <[email protected]>
The scrolling tree should be able to handle wheel events
Modified: trunk/Source/WebCore/bindings/v8/V8Helpers.cpp (106721 => 106722)
--- trunk/Source/WebCore/bindings/v8/V8Helpers.cpp 2012-02-04 01:41:14 UTC (rev 106721)
+++ trunk/Source/WebCore/bindings/v8/V8Helpers.cpp 2012-02-04 01:45:14 UTC (rev 106722)
@@ -42,7 +42,7 @@
{
V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject);
DOMWindow* domWindow = object->rootObject;
- if (!domWindow || domWindow != domWindow->frame()->domWindow())
+ if (!domWindow || !domWindow->frame() || domWindow != domWindow->frame()->domWindow())
return v8::Local<v8::Context>();
return V8Proxy::mainWorldContext(object->rootObject->frame());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
