Move code from StyleResolver to ViewportStyleResolver.

Source/core/css/CSSDefaultStyleSheets.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 57 matching lines @@
     sheet->parseString(str);
     // User Agent stylesheets are parsed once for the lifetime of the renderer
     // and are intentionally leaked.
     WTF_ANNOTATE_LEAKING_OBJECT_PTR(sheet.get());
     return sheet.release();
 }
 
 CSSDefaultStyleSheets::CSSDefaultStyleSheets()
     : m_defaultStyle(nullptr)
     , m_defaultViewportStyle(nullptr)
+    , m_defaultViewportOverrideStyle(nullptr)
     , m_defaultQuirksStyle(nullptr)
     , m_defaultPrintStyle(nullptr)
     , m_defaultViewSourceStyle(nullptr)
     , m_defaultXHTMLMobileProfileStyle(nullptr)
     , m_defaultTransitionStyle(nullptr)
     , m_defaultStyleSheet(nullptr)
     , m_viewportStyleSheet(nullptr)
+    , m_viewportOverrideStyleSheet(nullptr)
     , m_quirksStyleSheet(nullptr)
     , m_svgStyleSheet(nullptr)
     , m_mathmlStyleSheet(nullptr)
     , m_mediaControlsStyleSheet(nullptr)
     , m_fullscreenStyleSheet(nullptr)
 {
     m_defaultStyle = RuleSet::create();
     m_defaultViewportStyle = RuleSet::create();
+    m_defaultViewportOverrideStyle = RuleSet::create();
     m_defaultPrintStyle = RuleSet::create();
     m_defaultQuirksStyle = RuleSet::create();
 
     // Strict-mode rules.
     String defaultRules = loadResourceAsASCIIString("html.css") + LayoutTheme::theme().extraDefaultStyleSheet();
     m_defaultStyleSheet = parseUASheet(defaultRules);
     m_defaultStyle->addRulesFromSheet(defaultStyleSheet(), screenEval());
+    m_defaultPrintStyle->addRulesFromSheet(defaultStyleSheet(), printEval());
+
+    // @viewport rules.
+    String viewportAndroidRules = loadResourceAsASCIIString("viewportAndroid.css");
+    m_viewportOverrideStyleSheet = parseUASheet(viewportAndroidRules);
 #if OS(ANDROID)
-    String viewportRules = loadResourceAsASCIIString("viewportAndroid.css");
+    m_viewportStyleSheet = m_viewportOverrideStyleSheet;
 #else
-    String viewportRules;
+    m_viewportStyleSheet = parseUASheet(String());
 #endif
-    m_viewportStyleSheet = parseUASheet(viewportRules);
     m_defaultViewportStyle->addRulesFromSheet(viewportStyleSheet(), screenEval());
-    m_defaultPrintStyle->addRulesFromSheet(defaultStyleSheet(), printEval());
+    m_defaultViewportOverrideStyle->addRulesFromSheet(viewportOverrideStyleSheet(), screenEval());
 
     // Quirks-mode rules.
     String quirksRules = loadResourceAsASCIIString("quirks.css") + LayoutTheme::theme().extraQuirksStyleSheet();
     m_quirksStyleSheet = parseUASheet(quirksRules);
     m_defaultQuirksStyle->addRulesFromSheet(quirksStyleSheet(), screenEval());
 }
 
 RuleSet* CSSDefaultStyleSheets::defaultViewSourceStyle()
 {
     if (!m_defaultViewSourceStyle) {
@@ skipping 81 matching lines @@
     visitor->trace(m_defaultStyleSheet);
     visitor->trace(m_viewportStyleSheet);
     visitor->trace(m_quirksStyleSheet);
     visitor->trace(m_svgStyleSheet);
     visitor->trace(m_mathmlStyleSheet);
     visitor->trace(m_mediaControlsStyleSheet);
     visitor->trace(m_fullscreenStyleSheet);
 }
 
 } // namespace blink