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

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

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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
Index: Source/core/page/FrameView.cpp
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
index db745bc881bc6d45e52d1ae5508869b1a7cc6932..a31e0b68e41e142a3dec5157929d7ffd95dc2336 100644
--- a/Source/core/page/FrameView.cpp
+++ b/Source/core/page/FrameView.cpp
@@ -2263,25 +2263,27 @@ void FrameView::performPostLayoutTasks()
m_actionScheduler->resume();
- // Viewport-dependent media queries may cause us to need completely different style information.
+ IntSize currentSize = layoutSize(IncludeScrollbars);
+ float currentZoomFactor = renderView->style()->zoom();
+ bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
+ m_lastViewportSize = currentSize;
+ m_lastZoomFactor = currentZoomFactor;
+
+ // Viewport-dependent media queries and @viewport rue may cause us to need completely
+ // different style information.
if (m_frame->document()->styleResolver()->affectedByViewportChange()) {
+ if (resized)
+ m_frame->document()->styleResolver()->viewportStyleResolver()->resolve();
m_frame->document()->styleResolverChanged(DeferRecalcStyle);
InspectorInstrumentation::mediaQueryResultChanged(m_frame->document());
}
// Refetch render view since it can be destroyed by updateWidget() call above.
renderView = this->renderView();
- if (renderView && !renderView->printing()) {
- IntSize currentSize = layoutSize(IncludeScrollbars);
- float currentZoomFactor = renderView->style()->zoom();
- bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
- m_lastViewportSize = currentSize;
- m_lastZoomFactor = currentZoomFactor;
- if (resized) {
- m_frame->eventHandler()->sendResizeEvent();
- if (page && page->mainFrame() == m_frame)
- InspectorInstrumentation::didResizeMainFrame(page);
- }
+ if (renderView && !renderView->printing() && resized) {
+ m_frame->eventHandler()->sendResizeEvent();
+ if (page && page->mainFrame() == m_frame)
+ InspectorInstrumentation::didResizeMainFrame(page);
}
}

Powered by Google App Engine
This is Rietveld 408576698