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

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: Removed incorrect return. 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') | Source/web/tests/WebViewTest.cpp » ('J')
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..5e0d2f8f1fcb6e68aa96c092a0d99905899093bc 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -802,6 +802,8 @@ void FrameView::layout(bool allowSubtree)
TRACE_EVENT0("blink", "FrameView::layout");
TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "Layout");
+ autoSizeIfEnabled();
levin 2014/08/22 02:11:00 Why not after protector and changeInProgrammaticSc
rune 2014/08/22 08:52:26 Because I thought those would be called when Frame
+
// Protect the view from being deleted during layout (in recalcStyle)
RefPtr<FrameView> protector(this);
@@ -858,7 +860,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') | Source/web/tests/WebViewTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698