Modified: trunk/Source/WebKit2/ChangeLog (163334 => 163335)
--- trunk/Source/WebKit2/ChangeLog 2014-02-03 23:36:42 UTC (rev 163334)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-03 23:39:53 UTC (rev 163335)
@@ -1,3 +1,18 @@
+2014-02-03 Jer Noble <jer.no...@apple.com>
+
+ [WK2] Remove the VideoPluginProxyEnabled preference in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=128128
+
+ Reviewed by Brady Eidson.
+
+ The plugin proxy is iOS WK1 only, and has no meaning in WebKit2. Just set the preference to false.
+
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ * UIProcess/API/C/WKPreferencesRef.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2014-02-03 Dean Jackson <d...@apple.com>
Feature flag for shape-inside
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (163334 => 163335)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-03 23:36:42 UTC (rev 163334)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-03 23:39:53 UTC (rev 163335)
@@ -174,7 +174,6 @@
macro(SimpleLineLayoutDebugBordersEnabled, simpleLineLayoutDebugBordersEnabled, Bool, bool, false) \
macro(BackgroundShouldExtendBeyondPage, backgroundShouldExtendBeyondPage, Bool, bool, false) \
macro(MediaStreamEnabled, mediaStreamEnabled, Bool, bool, false) \
- macro(VideoPluginProxyEnabled, isVideoPluginProxyEnabled, Bool, bool, DEFAULT_VIDEO_PLUGIN_PROXY_ENABLED) \
macro(UseLegacyTextAlignPositionedElementBehavior, useLegacyTextAlignPositionedElementBehavior, Bool, bool, false) \
macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \
macro(MediaSourceEnabled, mediaSourceEnabled, Bool, bool, false) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (163334 => 163335)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-03 23:36:42 UTC (rev 163334)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-02-03 23:39:53 UTC (rev 163335)
@@ -1206,16 +1206,6 @@
return toImpl(preferencesRef)->mediaStreamEnabled();
}
-void WKPreferencesSetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setVideoPluginProxyEnabled(enabled);
-}
-
-bool WKPreferencesGetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->isVideoPluginProxyEnabled();
-}
-
void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setSpatialNavigationEnabled(enabled);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h (163334 => 163335)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2014-02-03 23:36:42 UTC (rev 163334)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2014-02-03 23:39:53 UTC (rev 163335)
@@ -244,10 +244,6 @@
WK_EXPORT void WKPreferencesSetMediaStreamEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetMediaStreamEnabled(WKPreferencesRef preferencesRef);
-// Defaults to true.
-WK_EXPORT void WKPreferencesSetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef, bool enabled);
-WK_EXPORT bool WKPreferencesGetVideoPluginProxyEnabled(WKPreferencesRef preferencesRef);
-
// Defaults to false.
WK_EXPORT void WKPreferencesSetSpatialNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled);
WK_EXPORT bool WKPreferencesGetSpatialNavigationEnabled(WKPreferencesRef preferencesRef);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163334 => 163335)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 23:36:42 UTC (rev 163334)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-03 23:39:53 UTC (rev 163335)
@@ -2530,7 +2530,7 @@
#endif
#if USE(PLUGIN_PROXY_FOR_VIDEO)
- settings->setVideoPluginProxyEnabled(store.getBoolValueForKey(WebPreferencesKey::isVideoPluginProxyEnabledKey()));
+ settings->setVideoPluginProxyEnabled(false);
#endif
#if ENABLE(WEB_AUDIO)
