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

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

Issue 14766010: Clarify the size of a document view (a.k.a layout size) that causes FrameView to emit the resize ev… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use js-test-pre.js Created 7 years, 6 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/fast/events/resize-events-fixed-layout-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/FrameView.cpp
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
index c1ecdf65b50588167a20dd550aa3b07b9f39c65d..fbf2d4a030b9ca7e4440721fc327f4888dae7dd6 100644
--- a/Source/core/page/FrameView.cpp
+++ b/Source/core/page/FrameView.cpp
@@ -995,7 +995,7 @@ void FrameView::layout(bool allowSubtree)
m_firstLayout = false;
m_firstLayoutCallbackPending = true;
- m_lastViewportSize = visibleContentRect(IncludeScrollbars).size();
+ m_lastViewportSize = layoutSize(IncludeScrollbars);
m_lastZoomFactor = root->style()->zoom();
// Set the initial vMode to AlwaysOn if we're auto.
@@ -2303,8 +2303,7 @@ void FrameView::performPostLayoutTasks()
// Refetch render view since it can be destroyed by updateWidget() call above.
renderView = this->renderView();
if (renderView && !renderView->printing()) {
- IntSize currentSize;
- currentSize = visibleContentRect(IncludeScrollbars).size();
+ IntSize currentSize = layoutSize(IncludeScrollbars);
float currentZoomFactor = renderView->style()->zoom();
bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
m_lastViewportSize = currentSize;
« no previous file with comments | « LayoutTests/fast/events/resize-events-fixed-layout-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698