Move code from StyleResolver to ViewportStyleResolver.

Source/core/css/resolver/ViewportStyleResolver.cpp

 /*
  * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 13 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
 
 #include "core/CSSValueKeywords.h"
+#include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
+#include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeLayoutStyle.h"
 #include "core/dom/ViewportDescription.h"
 #include "core/frame/FrameView.h"
+#include "core/frame/Settings.h"
+#include "core/inspector/InspectorInstrumentation.h"

[dgozman, 2015/03/08 06:32:11]

Not used anymore.

[rune, 2015/03/08 19:15:26]

Done.

 
 namespace blink {
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ViewportStyleResolver);
 
 ViewportStyleResolver::ViewportStyleResolver(Document* document)
     : m_document(document)
     , m_hasAuthorStyle(false)
 {
     ASSERT(m_document);
 }
 
+void ViewportStyleResolver::collectViewportRules()
+{
+    CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
+    collectViewportRules(defaultStyleSheets.defaultStyle(), UserAgentOrigin);
+
+    bool useMobileViewportStyle = m_document->settings() && m_document->settings()->useMobileViewportStyle();
+#if OS(ANDROID)
+    // FIXME: Remove when useMobileViewportStyle is set from chromium.
+    useMobileViewportStyle = true;
+#endif
+    if (useMobileViewportStyle)
+        collectViewportRules(defaultStyleSheets.defaultMobileViewportStyle(), UserAgentOrigin);
+
+    if (m_document->isMobileDocument())
+        collectViewportRules(defaultStyleSheets.defaultXHTMLMobileProfileStyle(), UserAgentOrigin);
+
+    if (ScopedStyleResolver* scopedResolver = m_document->scopedStyleResolver())
+        scopedResolver->collectViewportRulesTo(this);
+
+    resolve();
+}
+
 void ViewportStyleResolver::collectViewportRules(RuleSet* rules, Origin origin)
 {
     rules->compactRulesIfNeeded();
 
-    const WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport> >& viewportRules = rules->viewportRules();
+    const WillBeHeapVector<RawPtrWillBeMember<StyleRuleViewport>>& viewportRules = rules->viewportRules();
     for (size_t i = 0; i < viewportRules.size(); ++i)
         addViewportRule(viewportRules[i], origin);
 }
 
 void ViewportStyleResolver::addViewportRule(StyleRuleViewport* viewportRule, Origin origin)
 {
     StylePropertySet& propertySet = viewportRule->mutableProperties();
 
     unsigned propertyCount = propertySet.propertyCount();
     if (!propertyCount)
         return;
 
     if (origin == AuthorOrigin)
         m_hasAuthorStyle = true;
 
     if (!m_propertySet) {
         m_propertySet = propertySet.mutableCopy();
         return;
     }
 
     // We cannot use mergeAndOverrideOnConflict() here because it doesn't
     // respect the !important declaration (but addParsedProperty() does).
     for (unsigned i = 0; i < propertyCount; ++i)
         m_propertySet->addParsedProperty(propertySet.propertyAt(i).toCSSProperty());
 }
 
 void ViewportStyleResolver::resolve()
 {
-    if (!m_document)
-        return;
-
     if (!m_propertySet) {
         m_document->setViewportDescription(ViewportDescription(ViewportDescription::UserAgentStyleSheet));
         return;
     }
 
     ViewportDescription description(m_hasAuthorStyle ? ViewportDescription::AuthorStyleSheet : ViewportDescription::UserAgentStyleSheet);
 
     description.userZoom = viewportArgumentValue(CSSPropertyUserZoom);
     description.zoom = viewportArgumentValue(CSSPropertyZoom);
     description.minZoom = viewportArgumentValue(CSSPropertyMinZoom);
@@ skipping 103 matching lines @@
     return result;
 }
 
 DEFINE_TRACE(ViewportStyleResolver)
 {
     visitor->trace(m_propertySet);
     visitor->trace(m_document);
 }
 
 } // namespace blink