Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(880)

Unified Diff: Source/core/frame/Settings.h

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/Settings.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Settings.h
diff --git a/Source/core/frame/Settings.h b/Source/core/frame/Settings.h
index 76f5ac5097f6f27694fd84a4fe0cce2853601043..21e17d7253e2388df19dda799885658b63a5bf63 100644
--- a/Source/core/frame/Settings.h
+++ b/Source/core/frame/Settings.h
@@ -39,8 +39,6 @@
namespace WebCore {
-class Page; // For inspector, remove after http://crbug.com/327476
-
enum EditableLinkBehavior {
EditableLinkDefaultBehavior,
EditableLinkAlwaysLive,
@@ -57,24 +55,12 @@ public:
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.
@@ -93,21 +79,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
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/Settings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698