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 1392 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)
+bool InspectorPageAgent::shouldApplyViewportStyleOverride()
 {
-    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;
+    return m_deviceMetricsOverridden && m_emulateMobileEnabled;

[dgozman, 2015/03/05 10:55:53]

Since you are moving the heavy work into resolver itself, I'd prefer to switch
from InspectorInstrumentation call to a setting |useMobileViewportStyle|, which
InspectorPageAgent will toggle.

[rune, 2015/03/05 12:11:50]

You mean setting as in add to Settings.in?

If so, should that setting be used instead of #if OS(ANDROID) for normal default
style as well?

Adding aelias to get some Android feedback.

[aelias_OOO_until_Jul13, 2015/03/05 21:07:27]

Yes, I was already thinking myself that that #if OS(ANDROID) ought to be
replaced by a setting.  Go ahead.

 }
 
 void InspectorPageAgent::applyEmulatedMedia(String* media)
 {
     String emulatedMedia = m_state->getString(PageAgentState::pageAgentEmulatedMedia);
     if (!emulatedMedia.isEmpty())
         *media = emulatedMedia;
 }
 
 bool InspectorPageAgent::compositingEnabled(ErrorString* errorString)
@@ skipping 32 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