Settings should not call into inspector

Source/core/inspector/InspectorPageAgent.h

 /*
  * 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 109 matching lines @@
     virtual void startScreencast(ErrorString*, const String* format, const int* quality, const int* maxWidth, const int* maxHeight) OVERRIDE;
     virtual void stopScreencast(ErrorString*) OVERRIDE;
     virtual void handleJavaScriptDialog(ErrorString*, bool accept, const String* promptText) OVERRIDE;
     virtual void queryUsageAndQuota(WebCore::ErrorString*, const WTF::String&, WTF::RefPtr<WebCore::TypeBuilder::Page::Quota>&, WTF::RefPtr<WebCore::TypeBuilder::Page::Usage>&) OVERRIDE;
     virtual void setShowViewportSizeOnResize(ErrorString*, bool show, const bool* showGrid) OVERRIDE;
 
     // Geolocation override helper.
     GeolocationPosition* overrideGeolocationPosition(GeolocationPosition*);
 
     // Text autosizing override helpers.
-    bool overrideTextAutosizing(bool);
+    bool overrideTextAutosizing();

[pfeldman, 2014/01/24 16:25:21]

These are now private then.

[gnana, 2014/01/27 16:31:07]

Done.

     // Note: This is used by Settings::deviceScaleAdjustment to calculate the overridden device scale adjustment.
-    float overrideFontScaleFactor(float);
+    float overrideFontScaleFactor();
 
     // InspectorInstrumentation API
     void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*);
     void domContentLoadedEventFired(Frame*);
     void loadEventFired(Frame*);
     void didCommitLoad(Frame*, DocumentLoader*);
     void frameAttachedToParent(Frame*);
     void frameDetachedFromParent(Frame*);
     void loaderDetachedFromFrame(DocumentLoader*);
     void frameStartedLoading(Frame*);
     void frameStoppedLoading(Frame*);
     void frameScheduledNavigation(Frame*, double delay);
     void frameClearedScheduledNavigation(Frame*);
     void willRunJavaScriptDialog(const String& message);
     void didRunJavaScriptDialog();
     bool applyViewportStyleOverride(StyleResolver*);
     void applyEmulatedMedia(String*);
     void didPaint(RenderObject*, const GraphicsLayer*, GraphicsContext*, const LayoutRect&);
     void didLayout(RenderObject*);
     void didScroll();
     void didResizeMainFrame();
     void didRecalculateStyle();
     void scriptsEnabled(bool isEnabled);
+    void textAutosizingEnabled(bool isEnabled);
+    void fontScaleFactor(float factor);
 
     // Inspector Controller API
     virtual void setFrontend(InspectorFrontend*) OVERRIDE;
     virtual void clearFrontend() OVERRIDE;
     virtual void restore() OVERRIDE;
 
     void webViewResized(const IntSize&);
 
     // Cross-agents API
     Page* page() { return m_page; }
@@ skipping 34 matching lines @@
     String m_pendingScriptPreprocessor;
     String m_scriptPreprocessorSource;
     HashMap<Frame*, String> m_frameToIdentifier;
     HashMap<String, Frame*> m_identifierToFrame;
     HashMap<DocumentLoader*, String> m_loaderToIdentifier;
     bool m_enabled;
     bool m_geolocationOverridden;
     bool m_ignoreScriptsEnabledNotification;
     bool m_deviceMetricsOverridden;
     bool m_emulateViewportEnabled;
+    bool m_settingsCacheTextAutosizingEnabled;
+    float m_settingsCacheFontScaleFactor;
     RefPtr<GeolocationPosition> m_geolocationPosition;
     RefPtr<GeolocationPosition> m_platformGeolocationPosition;
 };
 
 
 } // namespace WebCore
 
 
 #endif // !defined(InspectorPagerAgent_h)