Title: [92512] branches/safari-534.51-branch/Source/WebKit/win
Diff
Modified: branches/safari-534.51-branch/Source/WebKit/win/ChangeLog (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/ChangeLog 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/ChangeLog 2011-08-05 21:00:39 UTC (rev 92512)
@@ -1,3 +1,27 @@
+2011-08-05 Lucas Forschler <[email protected]>
+
+ Merged 92414.
+
+ 2011-08-04 Jeff Miller <[email protected]>
+
+ Add support for setting and getting whether AVFoundation is enabled to IWebPreferences
+ https://bugs.webkit.org/show_bug.cgi?id=65718
+
+ Reviewed by Adam Roben.
+
+ * Interfaces/IWebPreferences.idl: Added setAVFoundationEnabled() and avFoundationEnabled().
+
+ * WebPreferenceKeysPrivate.h: Added WebKitAVFoundationEnabledPreferenceKey.
+
+ * WebPreferences.cpp:
+ (WebPreferences::avFoundationEnabled): Added.
+ (WebPreferences::setAVFoundationEnabled): Added.
+
+ * WebPreferences.h: Added setAVFoundationEnabled() and avFoundationEnabled().
+
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): Keep settings for AVFoundation being enabled in sync.
+
2011-06-07 Lucas Forschler <[email protected]>
Merged 88260.
Modified: branches/safari-534.51-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/Interfaces/IWebPreferences.idl 2011-08-05 21:00:39 UTC (rev 92512)
@@ -199,4 +199,7 @@
HRESULT editingBehavior([out, retval] WebKitEditingBehavior* editingBehavior);
HRESULT setEditingBehavior([in] WebKitEditingBehavior behavior);
+
+ HRESULT setAVFoundationEnabled(BOOL avFoundationEnabled);
+ HRESULT avFoundationEnabled(BOOL *avFoundationEnabled);
}
Modified: branches/safari-534.51-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2011-08-05 21:00:39 UTC (rev 92512)
@@ -152,3 +152,5 @@
#define WebKitMemoryInfoEnabledPreferenceKey "WebKitMemoryInfoEnabled"
#define WebKitFullScreenEnabledPreferenceKey "WebKitFullScreenEnabled"
+
+#define WebKitAVFoundationEnabledPreferenceKey "WebKitAVFoundationEnabled"
\ No newline at end of file
Modified: branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.cpp (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.cpp 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.cpp 2011-08-05 21:00:39 UTC (rev 92512)
@@ -1551,6 +1551,29 @@
#endif
}
+HRESULT WebPreferences::avFoundationEnabled(BOOL* enabled)
+{
+#if USE(AVFOUNDATION)
+ if (!enabled)
+ return E_POINTER;
+
+ *enabled = boolValueForKey(CFSTR(WebKitAVFoundationEnabledPreferenceKey));
+ return S_OK;
+#else
+ return E_NOTIMPL;
+#endif
+}
+
+HRESULT WebPreferences::setAVFoundationEnabled(BOOL enabled)
+{
+#if USE(AVFOUNDATION)
+ setBoolValue(CFSTR(WebKitAVFoundationEnabledPreferenceKey), enabled);
+ return S_OK;
+#else
+ return E_NOTIMPL;
+#endif
+}
+
void WebPreferences::willAddToWebView()
{
++m_numWebViews;
Modified: branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.h (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.h 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/WebPreferences.h 2011-08-05 21:00:39 UTC (rev 92512)
@@ -286,6 +286,12 @@
virtual HRESULT STDMETHODCALLTYPE shouldPaintCustomScrollbars(
/* [retval][out] */ BOOL *shouldPaint);
+ virtual HRESULT STDMETHODCALLTYPE setAVFoundationEnabled(
+ /* [in] */ BOOL);
+
+ virtual HRESULT STDMETHODCALLTYPE avFoundationEnabled(
+ /* [retval][out] */ BOOL*);
+
// IWebPreferencesPrivate
virtual HRESULT STDMETHODCALLTYPE setDeveloperExtrasEnabled(
/* [in] */ BOOL);
Modified: branches/safari-534.51-branch/Source/WebKit/win/WebView.cpp (92511 => 92512)
--- branches/safari-534.51-branch/Source/WebKit/win/WebView.cpp 2011-08-05 20:55:04 UTC (rev 92511)
+++ branches/safari-534.51-branch/Source/WebKit/win/WebView.cpp 2011-08-05 21:00:39 UTC (rev 92512)
@@ -4721,6 +4721,13 @@
return hr;
settings->setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? NormalRenderingMode : AlternateRenderingMode);
+#if USE(AVFOUNDATION)
+ hr = preferences->avFoundationEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings->setAVFoundationEnabled(enabled);
+#endif
+
COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
if (prefsPrivate) {
hr = prefsPrivate->authorAndUserStylesEnabled(&enabled);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
