Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: Source/WebCore/page/FrameView.cpp

Issue 9146052: Merge 105250 - Source/WebCore: Crash in FrameView::forceLayoutParentViewIfNeeded. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/svg/dom/resources/svg-font-face.svg ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/FrameView.cpp
===================================================================
--- Source/WebCore/page/FrameView.cpp (revision 105784)
+++ Source/WebCore/page/FrameView.cpp (working copy)
@@ -901,6 +901,8 @@
if (!svgRoot->needsSizeNegotiationWithHostDocument())
return;
+ RefPtr<FrameView> frameView = ownerRenderer->frame()->view();
+
ASSERT(!m_inLayoutParentView);
TemporarilyChange<bool> resetInLayoutParentView(m_inLayoutParentView, true);
@@ -919,7 +921,6 @@
rootView->updateWidgetPositions();
// Synchronously enter layout, to layout the view containing the host object/embed/iframe.
- FrameView* frameView = ownerRenderer->frame()->view();
ASSERT(frameView);
frameView->layout();
#endif
« no previous file with comments | « LayoutTests/svg/dom/resources/svg-font-face.svg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698