diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/WebSettingsImpl.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/WebSettingsImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/WebSettingsImpl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/WebSettingsImpl.h b/Source/WebKit/chromium/src/WebSettingsImpl.h index b52a364..323a5b3 100644 --- a/Source/WebKit/chromium/src/WebSettingsImpl.h +++ b/Source/WebKit/chromium/src/WebSettingsImpl.h @@ -88,8 +88,14 @@ public: virtual void setExperimentalWebGLEnabled(bool); virtual void setOpenGLMultisamplingEnabled(bool); virtual void setShowDebugBorders(bool); + virtual void setShowFPSCounter(bool); + virtual bool showFPSCounter() const { return m_showFPSCounter; } + virtual void setShowPlatformLayerTree(bool); + virtual bool showPlatformLayerTree() const { return m_showPlatformLayerTree; } virtual void setEditingBehavior(EditingBehavior); virtual void setAcceleratedCompositingEnabled(bool); + virtual void setCompositeToTextureEnabled(bool); + virtual bool compositeToTextureEnabled() const { return m_compositeToTextureEnabled; } virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool); virtual void setAcceleratedCompositingForVideoEnabled(bool); virtual void setAcceleratedCompositingForPluginsEnabled(bool); @@ -101,9 +107,14 @@ public: virtual void setAsynchronousSpellCheckingEnabled(bool); virtual void setCaretBrowsingEnabled(bool); virtual void setInteractiveFormValidationEnabled(bool); + virtual void setMinimumTimerInterval(double); + virtual void setFullScreenEnabled(bool); private: WebCore::Settings* m_settings; + bool m_compositeToTextureEnabled; + bool m_showFPSCounter; + bool m_showPlatformLayerTree; }; } // namespace WebKit |