Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

Source/core/page/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 15 matching lines @@
 
 #include "config.h"
 #include "core/page/FrameView.h"
 
 #include "HTMLNames.h"
 #include "RuntimeEnabledFeatures.h"
 #include "core/accessibility/AXObjectCache.h"
 #include "core/animation/DocumentTimeline.h"
 #include "core/css/FontLoader.h"
 #include "core/css/resolver/StyleResolver.h"
+#include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/OverflowEvent.h"
 #include "core/editing/FrameSelection.h"
 #include "core/html/HTMLFrameElement.h"
 #include "core/html/HTMLHtmlElement.h"
 #include "core/html/HTMLPlugInImageElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/TextResourceDecoder.h"
@@ skipping 2153 matching lines @@
 
     m_frame->selection()->setCaretRectNeedsUpdate();
     m_frame->selection()->updateAppearance();
 
     LayoutMilestones milestonesOfInterest = 0;
     LayoutMilestones milestonesAchieved = 0;
     Page* page = m_frame->page();
     if (page)
         milestonesOfInterest = page->layoutMilestones();
 
+    bool viewportDidChange = false;
+
     if (m_nestedLayoutCount <= 1) {
         if (m_firstLayoutCallbackPending) {
             m_firstLayoutCallbackPending = false;
+            viewportDidChange = true;
             m_frame->loader()->didFirstLayout();
             if (milestonesOfInterest & DidFirstLayout)
                 milestonesAchieved |= DidFirstLayout;
             if (page) {
                 if (page->mainFrame() == m_frame)
                     page->startCountingRelevantRepaintedObjects();
             }
         }
 
         // Ensure that we always send this eventually.
@@ skipping 22 matching lines @@
 
     if (page) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
             scrollingCoordinator->frameViewLayoutUpdated(this);
     }
 
     scrollToAnchor();
 
     m_actionScheduler->resume();
 
-    // Viewport-dependent media queries may cause us to need completely different style information.
-    if (m_frame->document()->styleResolver()->affectedByViewportChange()) {
+    IntSize currentSize = layoutSize(IncludeScrollbars);
+    float currentZoomFactor = renderView->style()->zoom();
+
+    bool didResize = currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor;
+    viewportDidChange |= didResize;
+
+    m_lastViewportSize = currentSize;
+    m_lastZoomFactor = currentZoomFactor;
+
+    // Viewport-dependent media queries and @viewport rue may cause us to need completely
+    // different style information.
+    if (viewportDidChange && m_frame->document()->styleResolver()->affectedByViewportChange()) {
+        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() && !m_firstLayout && didResize) {
+        m_frame->eventHandler()->sendResizeEvent();
+        if (page && page->mainFrame() == m_frame)
+            InspectorInstrumentation::didResizeMainFrame(page);
     }
 }
 
 void FrameView::postLayoutTimerFired(Timer<FrameView>*)
 {
     performPostLayoutTasks();
 }
 
 void FrameView::autoSizeIfEnabled()
 {
@@ skipping 1090 matching lines @@
 }
 
 AXObjectCache* FrameView::axObjectCache() const
 {
     if (frame() && frame()->document())
         return frame()->document()->existingAXObjectCache();
     return 0;
 }
 
 } // namespace WebCore