Move code from StyleResolver to ViewportStyleResolver.

Source/core/inspector/InspectorPageAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "config.h"
 #include "core/inspector/InspectorPageAgent.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptRegexp.h"
 #include "core/HTMLNames.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/StyleResolver.h"
-#include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/DOMImplementation.h"
 #include "core/dom/Document.h"
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ScriptResource.h"
 #include "core/frame/FrameView.h"
@@ skipping 378 matching lines @@
     , m_overlay(overlay)
     , m_lastScriptIdentifier(0)
     , m_enabled(false)
     , m_deviceMetricsOverridden(false)
     , m_emulateMobileEnabled(false)
     , m_touchEmulationEnabled(false)
     , m_originalTouchEnabled(false)
     , m_originalDeviceSupportsMouse(false)
     , m_originalDeviceSupportsTouch(false)
     , m_originalMaxTouchPoints(0)
+    , m_embedderFontScaleFactor(m_page->settings().deviceScaleAdjustment())
     , m_embedderTextAutosizingEnabled(m_page->settings().textAutosizingEnabled())
-    , m_embedderFontScaleFactor(m_page->settings().deviceScaleAdjustment())
     , m_embedderPreferCompositingToLCDTextEnabled(m_page->settings().preferCompositingToLCDTextEnabled())
     , m_embedderScriptEnabled(m_page->settings().scriptEnabled())
     , m_reloading(false)
+    , m_embedderUseMobileViewport(m_page->settings().useMobileViewportStyle())
 {
 }
 
 void InspectorPageAgent::setTextAutosizingEnabled(bool enabled)
 {
     m_embedderTextAutosizingEnabled = enabled;
     bool emulateMobileEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateMobileEnabled;
     if (!emulateMobileEnabled)
         m_page->settings().setTextAutosizingEnabled(enabled);
 }
@@ skipping 14 matching lines @@
         m_page->settings().setPreferCompositingToLCDTextEnabled(enabled);
 }
 
 void InspectorPageAgent::setScriptEnabled(bool enabled)
 {
     m_embedderScriptEnabled = enabled;
     if (!m_state->getBoolean(PageAgentState::pageAgentScriptExecutionDisabled))
         m_page->settings().setScriptEnabled(enabled);
 }
 
+void InspectorPageAgent::setUseMobileViewportStyle(bool enabled)
+{
+    m_embedderUseMobileViewport = enabled;
+    bool emulateMobileEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateMobileEnabled;
+    if (!emulateMobileEnabled)
+        m_page->settings().setUseMobileViewportStyle(enabled);
+}
+
 void InspectorPageAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend->page();
 }
 
 void InspectorPageAgent::clearFrontend()
 {
     ErrorString error;
     disable(&error);
     m_frontend = 0;
@@ skipping 854 matching lines @@
     Document* document = inspectedFrame()->document();
     if (document) {
         document->styleResolverChanged();
         document->mediaQueryAffectingValueChanged();
     }
 
     if (m_deviceMetricsOverridden) {
         m_page->settings().setTextAutosizingEnabled(mobile);
         m_page->settings().setPreferCompositingToLCDTextEnabled(mobile);
         m_page->settings().setDeviceScaleAdjustment(calculateFontScaleFactor(width, height, static_cast<float>(deviceScaleFactor)));
+        m_page->settings().setUseMobileViewportStyle(mobile);
     } else {
         m_page->settings().setTextAutosizingEnabled(m_embedderTextAutosizingEnabled);
         m_page->settings().setPreferCompositingToLCDTextEnabled(m_embedderPreferCompositingToLCDTextEnabled);
         m_page->settings().setDeviceScaleAdjustment(m_embedderFontScaleFactor);
+        m_page->settings().setUseMobileViewportStyle(m_embedderUseMobileViewport);
     }
 
     // FIXME: allow metrics override, fps counter and continuous painting at the same time: crbug.com/299837.
     m_client->setShowFPSCounter(m_state->getBoolean(PageAgentState::pageAgentShowFPSCounter) && !m_deviceMetricsOverridden);
     m_client->setContinuousPaintingEnabled(m_state->getBoolean(PageAgentState::pageAgentContinuousPaintingEnabled) && !m_deviceMetricsOverridden);
 }
 
 void InspectorPageAgent::updateTouchEventEmulationInPage(bool enabled)
 {
     if (!inspectedFrame()->isMainFrame())
@@ skipping 35 matching lines @@
 
     m_state->setString(PageAgentState::pageAgentEmulatedMedia, media);
     Document* document = inspectedFrame()->document();
     if (document) {
         document->mediaQueryAffectingValueChanged();
         document->styleResolverChanged();
         document->updateLayout();
     }
 }
 
-bool InspectorPageAgent::applyViewportStyleOverride(StyleResolver* resolver)
-{
-    if (!m_deviceMetricsOverridden || !m_emulateMobileEnabled)
-        return false;
-
-    RefPtrWillBeRawPtr<StyleSheetContents> styleSheet = StyleSheetContents::create(CSSParserContext(UASheetMode, 0));
-    styleSheet->parseString(loadResourceAsASCIIString("viewportAndroid.css"));
-    OwnPtrWillBeRawPtr<RuleSet> ruleSet = RuleSet::create();
-    ruleSet->addRulesFromSheet(styleSheet.get(), MediaQueryEvaluator("screen"));
-    resolver->viewportStyleResolver()->collectViewportRules(ruleSet.get(), ViewportStyleResolver::UserAgentOrigin);
-    return true;
-}
-
 void InspectorPageAgent::applyEmulatedMedia(String* media)
 {
     String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedMedia);
     if (!emulatedMedia.isEmpty())
         *media = emulatedMedia;
 }
 
 bool InspectorPageAgent::compositingEnabled(ErrorString* errorString)
 {
     if (!m_page->settings().acceleratedCompositingEnabled()) {
@@ skipping 30 matching lines @@
     visitor->trace(m_page);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_debuggerAgent);
     visitor->trace(m_cssAgent);
     visitor->trace(m_inspectorResourceContentLoader);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink