Title: [117005] trunk/Source/WebCore
- Revision
- 117005
- Author
- [email protected]
- Date
- 2012-05-14 14:50:42 -0700 (Mon, 14 May 2012)
Log Message
Crash in FrameView::windowClipRectForFrameOwner after r116371
https://bugs.webkit.org/show_bug.cgi?id=86035
Reviewed by David Hyatt.
Added a NULL-check for |parentView| as nothing guarantees it to be
non-NULL. Unfortunately no test as this is a crasher I couldn't
reproduce on my machine and the user logs were not helpful.
* page/FrameView.cpp:
(WebCore::FrameView::windowClipRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117004 => 117005)
--- trunk/Source/WebCore/ChangeLog 2012-05-14 21:47:48 UTC (rev 117004)
+++ trunk/Source/WebCore/ChangeLog 2012-05-14 21:50:42 UTC (rev 117005)
@@ -1,3 +1,17 @@
+2012-05-14 Julien Chaffraix <[email protected]>
+
+ Crash in FrameView::windowClipRectForFrameOwner after r116371
+ https://bugs.webkit.org/show_bug.cgi?id=86035
+
+ Reviewed by David Hyatt.
+
+ Added a NULL-check for |parentView| as nothing guarantees it to be
+ non-NULL. Unfortunately no test as this is a crasher I couldn't
+ reproduce on my machine and the user logs were not helpful.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::windowClipRect):
+
2012-05-14 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=86403
Modified: trunk/Source/WebCore/page/FrameView.cpp (117004 => 117005)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-05-14 21:47:48 UTC (rev 117004)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-05-14 21:50:42 UTC (rev 117005)
@@ -2565,7 +2565,8 @@
// Take our owner element and get its clip rect.
HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement();
FrameView* parentView = ownerElement->document()->view();
- clipRect.intersect(parentView->windowClipRectForFrameOwner(ownerElement, true));
+ if (parentView)
+ clipRect.intersect(parentView->windowClipRectForFrameOwner(ownerElement, true));
return clipRect;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
