Use css-device-adapt constraining for legacy viewport tags.

Source/core/css/resolver/StyleResolver.cpp

Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 7a9505417256eadeb614542a78019577a7b3f7ae..809e18cbc81db52bf5572a7e512117d5a94e7cea 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -178,8 +178,7 @@ void StyleResolver::finishAppendAuthorStyleSheets()
     if (document().renderer() && document().renderer()->style())
         document().renderer()->style()->font().update(fontSelector());
 
-    if (RuntimeEnabledFeatures::cssViewportEnabled())
-        collectViewportRules();
+    collectViewportRules();
 }
 
 void StyleResolver::resetAuthorStyle(const ContainerNode* scopingNode)
@@ -1016,11 +1015,13 @@ PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex)
 
 void StyleResolver::collectViewportRules()
 {
-    ASSERT(RuntimeEnabledFeatures::cssViewportEnabled());
+    collectViewportRules(CSSDefaultStyleSheets::defaultStyle, UserAgentOrigin);
+
+    if (document().isMobileDocument())

[kenneth.r.christiansen, 2013/09/04 11:39:01]

This replaces the hack in Document.cpp

+        collectViewportRules(CSSDefaultStyleSheets::xhtmlMobileProfileStyle(), UserAgentOrigin);
 
-    collectViewportRules(CSSDefaultStyleSheets::defaultStyle);
     if (m_ruleSets.userStyle())
-        collectViewportRules(m_ruleSets.userStyle());
+        collectViewportRules(m_ruleSets.userStyle(), UserAgentOrigin);
 
     if (ScopedStyleResolver* scopedResolver = m_styleTree.scopedStyleResolverForDocument())
         scopedResolver->collectViewportRulesTo(this);
@@ -1028,13 +1029,13 @@ void StyleResolver::collectViewportRules()
     viewportStyleResolver()->resolve();
 }
 
-void StyleResolver::collectViewportRules(RuleSet* rules)
+void StyleResolver::collectViewportRules(RuleSet* rules, ViewportOrigin origin)
 {
-    ASSERT(RuntimeEnabledFeatures::cssViewportEnabled());
-
     rules->compactRulesIfNeeded();
 
     const Vector<StyleRuleViewport*>& viewportRules = rules->viewportRules();
+    if (origin == AuthorOrigin && viewportRules.size())
+        viewportStyleResolver()->setHasAuthorStyle();
     for (size_t i = 0; i < viewportRules.size(); ++i)
         viewportStyleResolver()->addViewportRule(viewportRules[i]);
 }