summaryrefslogtreecommitdiffstats
path: root/WebKit/win/WebPreferences.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-15 12:23:52 +0000
committerSteve Block <steveblock@google.com>2010-02-16 11:48:32 +0000
commit8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch)
tree73f9065f370435d6fde32ae129d458a8c77c8dff /WebKit/win/WebPreferences.h
parentbf14be70295513b8076f3fa47a268a7e42b2c478 (diff)
downloadexternal_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip
external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz
external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebKit/win/WebPreferences.h')
-rw-r--r--WebKit/win/WebPreferences.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/win/WebPreferences.h b/WebKit/win/WebPreferences.h
index 1631e78..9209b7d 100644
--- a/WebKit/win/WebPreferences.h
+++ b/WebKit/win/WebPreferences.h
@@ -380,6 +380,12 @@ public:
virtual HRESULT STDMETHODCALLTYPE pluginAllowedRunTime(
/* [retval][out] */ UINT* allowedRunTime);
+ virtual HRESULT STDMETHODCALLTYPE isFrameSetFlatteningEnabled(
+ /* [retval][out] */ BOOL* enabled);
+
+ virtual HRESULT STDMETHODCALLTYPE setFrameSetFlatteningEnabled(
+ /* [in] */ BOOL enabled);
+
virtual HRESULT STDMETHODCALLTYPE setPreferenceForTest(
/* [in] */ BSTR key,
/* [in] */ BSTR value);