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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 473903002: Avoid auto-resize re-entrancy problems. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 4 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 | « no previous file | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 811fceaa7362576c08af53d67eee0bce25d4a619..ee66688d27c22ec4d1842bfd610d046d6782d6dd 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -799,6 +799,10 @@ void FrameView::layout(bool allowSubtree)
if (isInPerformLayout() || !m_frame->document()->isActive())
return;
+ autoSizeIfEnabled();
rune 2014/08/14 20:53:41 Perhaps this should be done after the layout inste
+ if (!needsLayout())
+ return;
rune 2014/08/15 09:27:15 This caused regressions. needsLayout() might be fa
+
TRACE_EVENT0("blink", "FrameView::layout");
TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout");
@@ -858,7 +862,6 @@ void FrameView::layout(bool allowSubtree)
}
}
updateCounters();
- autoSizeIfEnabled();
ScrollbarMode hMode;
ScrollbarMode vMode;
« no previous file with comments | « no previous file | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698