Settings should not call into inspector

Source/core/frame/Settings.cpp

Index: Source/core/frame/Settings.cpp
diff --git a/Source/core/frame/Settings.cpp b/Source/core/frame/Settings.cpp
old mode 100644
new mode 100755
index b7d8d76b6ab41ad056b74efc08d75e7b77a8dd37..bcae3a6f34f6b01eb3f2162e1f111248d8ae1bb5
--- a/Source/core/frame/Settings.cpp
+++ b/Source/core/frame/Settings.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "core/frame/Settings.h"
 
-#include "core/inspector/InspectorInstrumentation.h"
 #include "platform/scroll/ScrollbarTheme.h"
 
 namespace WebCore {
@@ -65,16 +64,15 @@ static const bool defaultSelectTrailingWhitespaceEnabled = false;
 #endif
 
 Settings::Settings()
-    : m_deviceScaleAdjustment(1.0f)
+    : m_openGLMultisamplingEnabled(false)
 #if HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP
     , m_textAutosizingWindowSizeOverride(320, 480)
+    SETTINGS_INITIALIZER_LIST

[eseidel, 2014/01/27 20:33:58]

Can we just reorder the members so that we can leave this after this #if?

[gnana, 2014/01/30 16:03:02]

Done.

     , m_textAutosizingEnabled(true)
 #else
+    SETTINGS_INITIALIZER_LIST
     , m_textAutosizingEnabled(false)
 #endif
-    SETTINGS_INITIALIZER_LIST
-    , m_isScriptEnabled(false)
-    , m_openGLMultisamplingEnabled(false)
 {
 }
 
@@ -96,14 +94,6 @@ void Settings::invalidate(SettingsDelegate::ChangeType changeType)
         m_delegate->settingsChanged(changeType);
 }
 
-// This is a total hack and should be removed.
-Page* Settings::pageOfShame() const
-{
-    if (!m_delegate)
-        return 0;
-    return m_delegate->page();
-}
-
 void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
 {
     if (m_textAutosizingEnabled == textAutosizingEnabled)
@@ -113,11 +103,6 @@ void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
     invalidate(SettingsDelegate::StyleChange);
 }
 
-bool Settings::textAutosizingEnabled() const
-{
-    return InspectorInstrumentation::overrideTextAutosizing(pageOfShame(), m_textAutosizingEnabled);
-}
-
 // FIXME: Move to Settings.in once make_settings can understand IntSize.
 void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizingWindowSizeOverride)
 {
@@ -128,23 +113,6 @@ void Settings::setTextAutosizingWindowSizeOverride(const IntSize& textAutosizing
     invalidate(SettingsDelegate::StyleChange);
 }
 
-void Settings::setDeviceScaleAdjustment(float deviceScaleAdjustment)
-{
-    m_deviceScaleAdjustment = deviceScaleAdjustment;
-    invalidate(SettingsDelegate::TextAutosizingChange);
-}
-
-float Settings::deviceScaleAdjustment() const
-{
-    return InspectorInstrumentation::overrideFontScaleFactor(pageOfShame(), m_deviceScaleAdjustment);
-}
-
-void Settings::setScriptEnabled(bool isScriptEnabled)
-{
-    m_isScriptEnabled = isScriptEnabled;
-    InspectorInstrumentation::scriptsEnabled(pageOfShame(), m_isScriptEnabled);
-}
-
 void Settings::setMockScrollbarsEnabled(bool flag)
 {
     ScrollbarTheme::setMockScrollbarsEnabled(flag);