Title: [139237] trunk/Source/WebKit/win
- Revision
- 139237
- Author
- roger_f...@apple.com
- Date
- 2013-01-09 13:55:18 -0800 (Wed, 09 Jan 2013)
Log Message
Add WebPreferences for Seamless IFrames on Windows port.
https://bugs.webkit.org/show_bug.cgi?id=106468.
Rubberstamped by Eric Seidel.
* Interfaces/IWebPreferences.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::areSeamlessIFramesEnabled):
(WebPreferences::setSeamlessIFramesEnabled):
* WebPreferences.h:
(WebPreferences):
* WebView.cpp:
(WebView::notifyPreferencesChanged):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (139236 => 139237)
--- trunk/Source/WebKit/win/ChangeLog 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/ChangeLog 2013-01-09 21:55:18 UTC (rev 139237)
@@ -1,3 +1,20 @@
+2013-01-09 Roger Fong <roger_f...@apple.com>
+
+ Add WebPreferences for Seamless IFrames on Windows port.
+ https://bugs.webkit.org/show_bug.cgi?id=106468.
+
+ Rubberstamped by Eric Seidel.
+
+ * Interfaces/IWebPreferences.idl:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::areSeamlessIFramesEnabled):
+ (WebPreferences::setSeamlessIFramesEnabled):
+ * WebPreferences.h:
+ (WebPreferences):
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2013-01-09 pe...@outlook.com <pe...@outlook.com>
[WinCairo] Link fix after r138759
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl (139236 => 139237)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2013-01-09 21:55:18 UTC (rev 139237)
@@ -210,4 +210,7 @@
HRESULT isCSSRegionsEnabled([out, retval] BOOL* enabled);
HRESULT setCSSRegionsEnabled([in] BOOL enabled);
+
+ HRESULT areSeamlessIFramesEnabled([out, retval] BOOL* enabled);
+ HRESULT setSeamlessIFramesEnabled([in] BOOL enabled);
}
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (139236 => 139237)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2013-01-09 21:55:18 UTC (rev 139237)
@@ -113,6 +113,8 @@
#define AllowContinuousSpellCheckingPreferenceKey "AllowContinuousSpellCheckingPreferenceKey" // default: true
+#define SeamlessIFramesPreferenceKey "SeamlessIFramesPreferenceKey" // default: false
+
#define WebKitDOMPasteAllowedPreferenceKey "WebKitDOMPasteAllowedPreferenceKey" // default: false
#define WebKitApplicationChromeModePreferenceKey "WebKitApplicationChromeMode" // default: false
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (139236 => 139237)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2013-01-09 21:55:18 UTC (rev 139237)
@@ -1307,6 +1307,18 @@
return S_OK;
}
+HRESULT WebPreferences::areSeamlessIFramesEnabled(BOOL* enabled)
+{
+ *enabled = boolValueForKey(CFSTR(SeamlessIFramesPreferenceKey));
+ return S_OK;
+}
+
+HRESULT WebPreferences::setSeamlessIFramesEnabled(BOOL enabled)
+{
+ setBoolValue(CFSTR(SeamlessIFramesPreferenceKey), enabled);
+ return S_OK;
+}
+
HRESULT WebPreferences::isDOMPasteAllowed(BOOL* enabled)
{
*enabled = boolValueForKey(CFSTR(WebKitDOMPasteAllowedPreferenceKey));
Modified: trunk/Source/WebKit/win/WebPreferences.h (139236 => 139237)
--- trunk/Source/WebKit/win/WebPreferences.h 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/WebPreferences.h 2013-01-09 21:55:18 UTC (rev 139237)
@@ -169,6 +169,12 @@
virtual HRESULT STDMETHODCALLTYPE setCSSRegionsEnabled(
/* [in] */ BOOL);
+ virtual HRESULT STDMETHODCALLTYPE areSeamlessIFramesEnabled(
+ /* [retval][out] */ BOOL* enabled);
+
+ virtual HRESULT STDMETHODCALLTYPE setSeamlessIFramesEnabled(
+ /* [in] */ BOOL);
+
virtual HRESULT STDMETHODCALLTYPE allowsAnimatedImages(
/* [retval][out] */ BOOL* enabled);
Modified: trunk/Source/WebKit/win/WebView.cpp (139236 => 139237)
--- trunk/Source/WebKit/win/WebView.cpp 2013-01-09 21:51:10 UTC (rev 139236)
+++ trunk/Source/WebKit/win/WebView.cpp 2013-01-09 21:55:18 UTC (rev 139237)
@@ -4677,6 +4677,11 @@
return hr;
RuntimeEnabledFeatures::setCSSRegionsEnabled(!!enabled);
+ hr = preferences->areSeamlessIFramesEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ RuntimeEnabledFeatures::setSeamlessIFramesEnabled(!!enabled);
+
hr = preferences->privateBrowsingEnabled(&enabled);
if (FAILED(hr))
return hr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
