1 files changed, 4 insertions, 32 deletions
diff --git a/chromium/third_party/WebKit/Source/core/frame/Settings.h b/chromium/third_party/WebKit/Source/core/frame/Settings.h
index 76f5ac5097f..13a03394c0e 100644
--- a/chromium/third_party/WebKit/Source/core/frame/Settings.h
+++ b/chromium/third_party/WebKit/Source/core/frame/Settings.h
@@ -27,7 +27,7 @@
 #ifndef Settings_h
 #define Settings_h
 
-#include "SettingsMacros.h"
+#include "core/SettingsMacros.h"
 #include "core/editing/EditingBehaviorTypes.h"
 #include "core/frame/SettingsDelegate.h"
 #include "platform/Timer.h"
@@ -39,42 +39,21 @@
 
 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 notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFamilyChange); }
 
     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.
@@ -93,21 +72,14 @@ private:
 
     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;
 };
 
 } // namespace WebCore