Title: [139648] branches/chromium/1364/Source/WebCore/page/FrameView.cpp
- Revision
- 139648
- Author
- cev...@google.com
- Date
- 2013-01-14 13:11:15 -0800 (Mon, 14 Jan 2013)
Log Message
Merge 139365
BUG=153184
Review URL: https://codereview.chromium.org/11885028
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/page/FrameView.cpp (139647 => 139648)
--- branches/chromium/1364/Source/WebCore/page/FrameView.cpp 2013-01-14 21:08:32 UTC (rev 139647)
+++ branches/chromium/1364/Source/WebCore/page/FrameView.cpp 2013-01-14 21:11:15 UTC (rev 139648)
@@ -3102,6 +3102,9 @@
FrameView* FrameView::parentFrameView() const
{
+ if (!parent())
+ return 0;
+
if (Frame* parentFrame = m_frame->tree()->parent())
return parentFrame->view();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
