Settings should not call into inspector

Source/core/frame/Settings.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 #include "core/frame/SettingsDelegate.h"
 #include "platform/Timer.h"
 #include "platform/fonts/GenericFontFamilySettings.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
-class Page; // For inspector, remove after http://crbug.com/327476
-
 enum EditableLinkBehavior {
     EditableLinkDefaultBehavior,
     EditableLinkAlwaysLive,
     EditableLinkOnlyLiveWithShiftKey,
     EditableLinkLiveWhenNotFocused,
     EditableLinkNeverLive
 };
 
 class Settings {
     WTF_MAKE_NONCOPYABLE(Settings); WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<Settings> create();
 
     GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFontFamilySettings; }
 
     void setTextAutosizingEnabled(bool);
-    bool textAutosizingEnabled() const;
-
-    // Compensates for poor text legibility on mobile devices. This value is
-    // multiplied by the font scale factor when performing text autosizing of
-    // websites that do not set an explicit viewport description.
-    void setDeviceScaleAdjustment(float);
-    float deviceScaleAdjustment() const;
+    bool textAutosizingEnabled() const { return m_textAutosizingEnabled; }
 
     // Only set by Layout Tests, and only used if textAutosizingEnabled() returns true.
     void setTextAutosizingWindowSizeOverride(const IntSize&);
     const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutosizingWindowSizeOverride; }
 
-    // Clients that execute script should call ScriptController::canExecuteScripts()
-    // instead of this function. ScriptController::canExecuteScripts() checks the
-    // HTML sandbox, plug-in sandboxing, and other important details.
-    bool isScriptEnabled() const { return m_isScriptEnabled; }
-    void setScriptEnabled(bool);
-
     SETTINGS_GETTERS_AND_SETTERS
 
     // FIXME: This does not belong here.
     static void setMockScrollbarsEnabled(bool flag);
     static bool mockScrollbarsEnabled();
 
     // FIXME: naming_utilities.py isn't smart enough to handle OpenGL yet.
     // It could handle "GL", but that seems a bit overly broad.
     void setOpenGLMultisamplingEnabled(bool flag);
     bool openGLMultisamplingEnabled() { return m_openGLMultisamplingEnabled; }
 
     void setDelegate(SettingsDelegate*);
 
 private:
     Settings();
 
     void invalidate(SettingsDelegate::ChangeType);
 
-    // FIXME: pageOfShame() is a hack for the inspector code:
-    // http://crbug.com/327476
-    Page* pageOfShame() const;
-
     SettingsDelegate* m_delegate;
 
     GenericFontFamilySettings m_genericFontFamilySettings;
-    float m_deviceScaleAdjustment;
+    bool m_openGLMultisamplingEnabled : 1;
     IntSize m_textAutosizingWindowSizeOverride;
-    bool m_textAutosizingEnabled : 1;
 
     SETTINGS_MEMBER_VARIABLES
 
-    bool m_isScriptEnabled : 1;
-    bool m_openGLMultisamplingEnabled : 1;
+    bool m_textAutosizingEnabled : 1;
 };
 
 } // namespace WebCore
 
 #endif // Settings_h