Changeset 168079 in webkit

Timestamp:

Apr 30, 2014 7:19:33 PM (10 years ago)

Author:

Simon Fraser

Message:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
​https://bugs.webkit.org/show_bug.cgi?id=132396

Reviewed by Eric Carlson.

Source/JavaScriptCore:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.

• Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.

• Configurations/FeatureDefines.xcconfig:
• WebCore.exp.in:
• css/StyleResolver.cpp:

(WebCore::StyleResolver::canShareStyleWithElement):

• dom/DOMImplementation.cpp:

(WebCore::DOMImplementation::createDocument):

• editing/TextIterator.cpp:

(WebCore::isRendererReplacedElement):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::parseAttribute):

• html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::setNeedWidgetUpdate): Deleted.

• html/HTMLMediaSession.cpp:

(WebCore::HTMLMediaSession::showPlaybackTargetPicker):
(WebCore::HTMLMediaSession::hasWirelessPlaybackTargets):
(WebCore::HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners):

• html/HTMLVideoElement.cpp:

(WebCore::HTMLVideoElement::createElementRenderer):
(WebCore::HTMLVideoElement::didAttachRenderers):
(WebCore::HTMLVideoElement::parseAttribute):
(WebCore::HTMLVideoElement::setDisplayMode):

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlTextTrackContainerElement::updateSizes):

• loader/EmptyClients.cpp:

(WebCore::EmptyFrameLoaderClient::createMediaPlayerProxyPlugin): Deleted.

• loader/EmptyClients.h:
• loader/FrameLoaderClient.h:
• loader/SubframeLoader.cpp:

(WebCore::SubframeLoader::loadPlugin):
(WebCore::SubframeLoader::loadMediaPlayerProxyPlugin): Deleted.

• loader/SubframeLoader.h:
• page/FrameView.cpp:

(WebCore::FrameView::updateEmbeddedObject):

• page/Settings.cpp:

(WebCore::Settings::setVideoPluginProxyEnabled): Deleted.

• page/Settings.h:

(WebCore::Settings::isVideoPluginProxyEnabled): Deleted.

• platform/graphics/GraphicsLayerClient.h:

(WebCore::GraphicsLayerClient::mediaLayerMustBeUpdatedOnMainThread): Deleted.

• platform/graphics/MediaPlayer.cpp:

(WebCore::installedMediaEngines):
(WebCore::MediaPlayer::MediaPlayer):
(WebCore::MediaPlayer::loadWithNextMediaEngine):
(WebCore::NullMediaPlayerPrivate::deliverNotification): Deleted.
(WebCore::NullMediaPlayerPrivate::setMediaPlayerProxy): Deleted.
(WebCore::NullMediaPlayerPrivate::setControls): Deleted.
(WebCore::MediaPlayer::deliverNotification): Deleted.
(WebCore::MediaPlayer::setMediaPlayerProxy): Deleted.
(WebCore::MediaPlayer::setControls): Deleted.

• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::deliverNotification): Deleted.
(WebCore::MediaPlayerPrivateInterface::setMediaPlayerProxy): Deleted.
(WebCore::MediaPlayerPrivateInterface::setControls): Deleted.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::updateContentsRects):
(WebCore::GraphicsLayerCA::mediaLayerMustBeUpdatedOnMainThread): Deleted.

• platform/graphics/ca/GraphicsLayerCA.h:
• rendering/RenderEmbeddedObject.cpp:

(WebCore::RenderEmbeddedObject::canHaveChildren):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::mediaLayerMustBeUpdatedOnMainThread): Deleted.

• rendering/RenderLayerBacking.h:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingForVideo):

Source/WebKit/mac:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.

• Configurations/FeatureDefines.xcconfig:
• Plugins/WebPluginContainerPrivate.h:
• Plugins/WebPluginController.h:
• Plugins/WebPluginController.mm:

(-[WebPluginController dealloc]):
(-[WebPluginController plugInsAreRunning]):
(-[WebPluginController stopAllPlugins]):
(-[WebPluginController stopPluginsForPageCache]):
(-[WebPluginController restorePluginsFromCache]):
(-[WebPluginController addPlugin:]):
(-[WebPluginController destroyPlugin:]):
(-[WebPluginController destroyAllPlugins]):
(-[NSView isMediaPlugInProxyView]): Deleted.
(-[NSView setIsMediaPlugInProxyView:]): Deleted.
(-[WebPluginController mediaPlugInProxyViewCreated:]): Deleted.
(+[WebPluginController pluginViewHidden:]): Deleted.
(mediaProxyClient): Deleted.
(-[WebPluginController _webPluginContainerSetMediaPlayerProxy:forElement:]): Deleted.
(-[WebPluginController _webPluginContainerPostMediaPlayerNotification:forElement:]): Deleted.

• WebCoreSupport/WebFrameLoaderClient.h:
• WebCoreSupport/WebFrameLoaderClient.mm:

(pluginView):

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):
(-[WebView _videoProxyPluginForMIMEType:]): Deleted.

• WebView/WebViewInternal.h:

Source/WebKit2:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.

• Configurations/FeatureDefines.xcconfig:
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createMediaPlayerProxyPlugin): Deleted.
(WebKit::WebFrameLoaderClient::hideMediaPlayerProxyPlugin): Deleted.
(WebKit::WebFrameLoaderClient::showMediaPlayerProxyPlugin): Deleted.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Source/WTF:

Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.

• wtf/FeatureDefines.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FeatureDefines.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/css/StyleResolver.cpp (modified) (2 diffs)
• WebCore/dom/DOMImplementation.cpp (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (1 diff)
• WebCore/html/HTMLMediaElement.cpp (modified) (20 diffs)
• WebCore/html/HTMLMediaElement.h (modified) (7 diffs)
• WebCore/html/HTMLMediaSession.cpp (modified) (3 diffs)
• WebCore/html/HTMLVideoElement.cpp (modified) (4 diffs)
• WebCore/html/shadow/MediaControlElements.cpp (modified) (2 diffs)
• WebCore/loader/EmptyClients.cpp (modified) (1 diff)
• WebCore/loader/EmptyClients.h (modified) (1 diff)
• WebCore/loader/FrameLoaderClient.h (modified) (2 diffs)
• WebCore/loader/SubframeLoader.cpp (modified) (3 diffs)
• WebCore/loader/SubframeLoader.h (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/page/Settings.cpp (modified) (2 diffs)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebCore/platform/graphics/GraphicsLayerClient.h (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayer.cpp (modified) (5 diffs)
• WebCore/platform/graphics/MediaPlayer.h (modified) (3 diffs)
• WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (4 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (1 diff)
• WebCore/rendering/RenderEmbeddedObject.cpp (modified) (2 diffs)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.h (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• WebKit/mac/Plugins/WebPluginContainerPrivate.h (modified) (2 diffs)
• WebKit/mac/Plugins/WebPluginController.h (modified) (2 diffs)
• WebKit/mac/Plugins/WebPluginController.mm (modified) (10 diffs)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (8 diffs)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebViewInternal.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=132396
+
+        Reviewed by Eric Carlson.
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-04-30  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ -161 +161 @@
 ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_$(PLATFORM_NAME));
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos = ENABLE_PLUGIN_PROXY_FOR_VIDEO;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphonesimulator = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos);
 ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
 ENABLE_PROMISES = ENABLE_PROMISES;
@@ -242 +239 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=132396
+
+        Reviewed by Eric Carlson.
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.
+
+        * wtf/FeatureDefines.h:
+
 2014-04-30  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -649 +649 @@
 #endif
 
-#if !defined(ENABLE_PLUGIN_PROXY_FOR_VIDEO)
-#define ENABLE_PLUGIN_PROXY_FOR_VIDEO 0
-#endif
-
 #if !defined(ENABLE_POINTER_LOCK)
 #define ENABLE_POINTER_LOCK 0

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=132396
+
+        Reviewed by Eric Carlson.
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebCore.exp.in:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::canShareStyleWithElement):
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::createDocument):
+        * editing/TextIterator.cpp:
+        (WebCore::isRendererReplacedElement):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::parseAttribute):
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::setNeedWidgetUpdate): Deleted.
+        * html/HTMLMediaSession.cpp:
+        (WebCore::HTMLMediaSession::showPlaybackTargetPicker):
+        (WebCore::HTMLMediaSession::hasWirelessPlaybackTargets):
+        (WebCore::HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners):
+        * html/HTMLVideoElement.cpp:
+        (WebCore::HTMLVideoElement::createElementRenderer):
+        (WebCore::HTMLVideoElement::didAttachRenderers):
+        (WebCore::HTMLVideoElement::parseAttribute):
+        (WebCore::HTMLVideoElement::setDisplayMode):
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::updateSizes):
+        * loader/EmptyClients.cpp:
+        (WebCore::EmptyFrameLoaderClient::createMediaPlayerProxyPlugin): Deleted.
+        * loader/EmptyClients.h:
+        * loader/FrameLoaderClient.h:
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadPlugin):
+        (WebCore::SubframeLoader::loadMediaPlayerProxyPlugin): Deleted.
+        * loader/SubframeLoader.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateEmbeddedObject):
+        * page/Settings.cpp:
+        (WebCore::Settings::setVideoPluginProxyEnabled): Deleted.
+        * page/Settings.h:
+        (WebCore::Settings::isVideoPluginProxyEnabled): Deleted.
+        * platform/graphics/GraphicsLayerClient.h:
+        (WebCore::GraphicsLayerClient::mediaLayerMustBeUpdatedOnMainThread): Deleted.
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines):
+        (WebCore::MediaPlayer::MediaPlayer):
+        (WebCore::MediaPlayer::loadWithNextMediaEngine):
+        (WebCore::NullMediaPlayerPrivate::deliverNotification): Deleted.
+        (WebCore::NullMediaPlayerPrivate::setMediaPlayerProxy): Deleted.
+        (WebCore::NullMediaPlayerPrivate::setControls): Deleted.
+        (WebCore::MediaPlayer::deliverNotification): Deleted.
+        (WebCore::MediaPlayer::setMediaPlayerProxy): Deleted.
+        (WebCore::MediaPlayer::setControls): Deleted.
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::deliverNotification): Deleted.
+        (WebCore::MediaPlayerPrivateInterface::setMediaPlayerProxy): Deleted.
+        (WebCore::MediaPlayerPrivateInterface::setControls): Deleted.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateGeometry):
+        (WebCore::GraphicsLayerCA::updateContentsRects):
+        (WebCore::GraphicsLayerCA::mediaLayerMustBeUpdatedOnMainThread): Deleted.
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::canHaveChildren):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::mediaLayerMustBeUpdatedOnMainThread): Deleted.
+        * rendering/RenderLayerBacking.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForVideo):
+
 2014-04-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

@@ -161 +161 @@
 ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_$(PLATFORM_NAME));
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos = ENABLE_PLUGIN_PROXY_FOR_VIDEO;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphonesimulator = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos);
 ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
 ENABLE_PROMISES = ENABLE_PROMISES;
@@ -242 +239 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WebCore/WebCore.exp.in

@@ -3198 +3198 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-__ZN7WebCore16HTMLMediaElement19deliverNotificationE32MediaPlayerProxyNotificationType
-__ZN7WebCore16HTMLMediaElement19setMediaPlayerProxyEP19WebMediaPlayerProxy
-__ZN7WebCore8Settings24gVideoPluginProxyEnabledE
-__ZN7WebCore8Settings26setVideoPluginProxyEnabledEb
-__ZN7WebCore9HTMLNames8audioTagE
-#endif
-
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
 __ZN7WebCore3macERKNS_15ProtectionSpaceE

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -158 +158 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLAudioElement.h"
-#endif
-
 #if ENABLE(VIDEO_TRACK)
 #include "WebVTTElement.h"
-#endif
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
 #endif
 
@@ -644 +636 @@
     if (element->hasTagName(iframeTag) || element->hasTagName(frameTag) || element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag) || element->hasTagName(canvasTag))
         return false;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    // With proxying, the media elements are backed by a RenderEmbeddedObject.
-    if ((element->hasTagName(videoTag) || element->hasTagName(audioTag)) && toHTMLMediaElement(element)->shouldUseVideoPluginProxy())
-        return false;
-#endif
 
     if (elementHasDirectionAuto(element))

trunk/Source/WebCore/dom/DOMImplementation.cpp

@@ -332 +332 @@
 
 #if ENABLE(VIDEO)
-    
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (!frame || !frame->settings().isVideoPluginProxyEnabled())
-#endif
-    {
-        // Check to see if the type can be played by our MediaPlayer, if so create a MediaDocument
-        // Key system is not applicable here.
-        DOMImplementationSupportsTypeClient client(frame && frame->settings().needsSiteSpecificQuirks(), url.host());
-        MediaEngineSupportParameters parameters;
-        parameters.type = type;
-        parameters.url = url;
-        if (MediaPlayer::supportsType(parameters, &client))
-            return MediaDocument::create(frame, url);
-    }
+    // Check to see if the type can be played by our MediaPlayer, if so create a MediaDocument
+    // Key system is not applicable here.
+    DOMImplementationSupportsTypeClient client(frame && frame->settings().needsSiteSpecificQuirks(), url.host());
+    MediaEngineSupportParameters parameters;
+    parameters.type = type;
+    parameters.url = url;
+    if (MediaPlayer::supportsType(parameters, &client))
+        return MediaDocument::create(frame, url);
 #endif
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -250 +250 @@
         return false;
     
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (renderer->isImage() || renderer->isMedia())
-        return true;
-    if (renderer->isWidget()) {
-        if (renderer->node() && renderer->node()->isElementNode()) {
-            Element* element = toElement(renderer->node());
-            if (element->hasTagName(videoTag) || !element->hasTagName(audioTag))
-                return false; // See <rdar://problem/6893793>.
-        }
-        return true;
-    }
-#else
     if (renderer->isImage() || renderer->isWidget() || renderer->isMedia())
         return true;
-#endif
 
     if (renderer->node() && renderer->node()->isElementNode()) {

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -84 +84 @@
 #include <wtf/text/CString.h>
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "RenderEmbeddedObject.h"
-#include "SubframeLoader.h"
-#include "Widget.h"
-#endif
-
 #if ENABLE(VIDEO_TRACK)
 #include "AudioTrackList.h"
@@ -256 +250 @@
 
 HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    : HTMLFrameOwnerElement(tagName, document)
-#else
     : HTMLElement(tagName, document)
-#endif
     , ActiveDOMObject(&document)
     , m_loadTimer(this, &HTMLMediaElement::loadTimerFired)
@@ -283 +273 @@
 #if PLATFORM(IOS)
     , m_videoFullscreenGravity(MediaPlayer::VideoGravityResizeAspect)
-#endif
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    , m_proxyWidget(0)
 #endif
     , m_preload(MediaPlayer::Auto)
@@ -319 +306 @@
     , m_closedCaptionsVisible(false)
     , m_webkitLegacyClosedCaptionOverride(false)
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    , m_needWidgetUpdate(false)
-#endif
     , m_completelyLoaded(false)
     , m_havePreparedToPlay(false)
@@ -656 +640 @@
     HTMLElement::finishParsingChildren();
     m_parsingInProgress = false;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        document().updateStyleIfNeeded();
-        createMediaPlayerProxy();
-    }
-#endif
     
 #if ENABLE(VIDEO_TRACK)
@@ -675 +652 @@
 bool HTMLMediaElement::rendererIsNeeded(const RenderStyle& style)
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy())
-        return true;
-#endif
     return controls() && HTMLElement::rendererIsNeeded(style);
 }
@@ -684 +657 @@
 RenderPtr<RenderElement> HTMLMediaElement::createElementRenderer(PassRef<RenderStyle> style)
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        // Setup the renderer if we already have a proxy widget.
-        auto mediaRenderer = createRenderer<RenderEmbeddedObject>(*this, std::move(style));
-        if (m_proxyWidget) {
-            mediaRenderer->setWidget(m_proxyWidget);
-
-            if (Frame* frame = document().frame())
-                frame->loader().client().showMediaPlayerProxyPlugin(m_proxyWidget.get());
-        }
-        return std::move(mediaRenderer);
-    }
-#endif
     return createRenderer<RenderMedia>(*this, std::move(style));
 }
@@ -773 +733 @@
 {
     ASSERT(!renderer());
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy())
-        m_needWidgetUpdate = true;
-#endif
 }
 
@@ -784 +739 @@
     if (renderer())
         renderer()->updateFromElement();
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    else if (m_proxyWidget) {
-        if (Frame* frame = document().frame())
-            frame->loader().client().hideMediaPlayerProxyPlugin(m_proxyWidget.get());
-    }
-#endif
 }
 
@@ -803 +752 @@
 
     if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaResource)) {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        if (shouldUseVideoPluginProxy())
-            createMediaPlayerProxy();
-#endif
-
         prepareForLoad();
         setFlags(m_pendingActionFlags, LoadMediaResource);
@@ -982 +926 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        if (m_player)
-            m_player->cancelLoad();
-        else
-            createMediaPlayerProxy();
-    } else
-#endif
     createMediaPlayer();
 
@@ -1196 +1132 @@
     }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (!shouldUseVideoPluginProxy())
-#endif
-        // Recreate the media player for the new url
-        createMediaPlayer();
+    // Recreate the media player for the new url
+    createMediaPlayer();
 
     m_loadState = LoadingFromSourceElement;
@@ -4506 +4439 @@
     bool playerPaused = m_player->paused();
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        if (shouldBePlaying && !m_requestingPlay && !m_player->readyForPlayback())
-            shouldBePlaying = false;
-        else if (!shouldBePlaying && m_requestingPlay && m_player->readyForPlayback())
-            shouldBePlaying = true;
-    }
-#endif
-
-    LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s", 
+    LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",
         boolString(shouldBePlaying), boolString(playerPaused));
 
@@ -4656 +4580 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (!shouldUseVideoPluginProxy())
-#endif
     m_player.clear();
 
@@ -4781 +4702 @@
 void HTMLMediaElement::defaultEventHandler(Event* event)
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        auto renderer = this->renderer();
-        if (!renderer || !renderer->isWidget())
-            return;
-
-        if (Widget* widget = toRenderWidget(renderer)->widget())
-            widget->handleEvent(event);
-        return;
-    }
-#endif
     HTMLElement::defaultEventHandler(event);
 }
@@ -4798 +4708 @@
 bool HTMLMediaElement::willRespondToMouseClickEvents()
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy())
-        return true;
-#endif
     return HTMLElement::willRespondToMouseClickEvents();
 }
@@ -4818 +4724 @@
 }
 #endif // ENABLE(VIDEO_TRACK)
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-
-void HTMLMediaElement::ensureMediaPlayer()
-{
-    if (!m_player)
-        createMediaPlayer();
-}
-
-void HTMLMediaElement::deliverNotification(MediaPlayerProxyNotificationType notification)
-{
-    if (notification == MediaPlayerNotificationPlayPauseButtonPressed) {
-#if PLATFORM(IOS)
-        removeBehaviorsRestrictionsAfterFirstUserGesture();
-#endif
-        togglePlayState();
-        return;
-    }
-#if PLATFORM(IOS)
-    else if (notification == MediaPlayerRequestBeginPlayback) {
-        if (m_paused)
-            playInternal();
-    } else if (notification == MediaPlayerRequestPausePlayback) {
-        if (!m_paused)
-            pauseInternal();
-    } else if (notification == MediaPlayerNotificationLoseFocus) {
-        if (!m_paused)
-            pauseInternal();
-    } else if (notification == MediaPlayerNotificationDidPlayToTheEnd) {
-        if (!m_paused && !loop())
-            pauseInternal();
-    } else if (notification == MediaPlayerNotificationMediaValidated || notification == MediaPlayerNotificationReadyForInspection) {
-        // The media player sometimes reports an apparently spurious error just as we request playback, and then follows almost
-        // immediately with ReadyForInspection and/or MediaValidated. The spec doesn't deal with a "fatal" error followed
-        // by ressurection, so if we have set an error clear it now.
-        m_error = 0;
-    } else if (notification == MediaPlayerNotificationEnteredFullscreen) {
-        scheduleEvent(eventNames().webkitbeginfullscreenEvent);
-        m_isFullscreen = true;
-    } else if (notification == MediaPlayerNotificationExitedFullscreen) {
-        scheduleEvent(eventNames().webkitendfullscreenEvent);
-        m_isFullscreen = false;
-    }
-#endif
-
-    if (m_player)
-        m_player->deliverNotification(notification);
-
-#if PLATFORM(IOS)
-    if (notification == MediaPlayerNotificationMediaValidated) {
-        // If the element is supposed to autoplay and we allow it, tell the media engine to begin loading
-        // data now. Playback will begin automatically when enough data has loaded.
-        if (m_autoplaying && m_paused && autoplay())
-            prepareToPlay();
-    } else if (notification == MediaPlayerNotificationEnteredFullscreen)
-        didBecomeFullscreenElement();
-    else if (notification == MediaPlayerNotificationExitedFullscreen)
-        willStopBeingFullscreenElement();
-#endif
-}
-
-void HTMLMediaElement::setMediaPlayerProxy(WebMediaPlayerProxy* proxy)
-{
-    ensureMediaPlayer();
-    m_player->setMediaPlayerProxy(proxy);
-}
-
-void HTMLMediaElement::getPluginProxyParams(URL& url, Vector<String>& names, Vector<String>& values)
-{
-    Ref<HTMLMediaElement> protect(*this); // selectNextSourceChild may fire 'beforeload', which can make arbitrary DOM mutations.
-
-    Frame* frame = document().frame();
-
-    if (isVideo()) {
-        HTMLVideoElement* video = toHTMLVideoElement(this);
-        URL posterURL = video->posterImageURL();
-        if (!posterURL.isEmpty() && frame && frame->loader().willLoadMediaElementURL(posterURL)) {
-            names.append(ASCIILiteral("_media_element_poster_"));
-            values.append(posterURL.string());
-        }
-    }
-
-    if (controls()) {
-        names.append(ASCIILiteral("_media_element_controls_"));
-        values.append(ASCIILiteral("true"));
-    }
-
-#if PLATFORM(IOS)
-    // Don't pass the URL to the plug-in as part of the initialization arguments, we always pass the URL
-    // in loadResource and calling selectNextSourceChild here can mess up the processing of <source>
-    // elements later.
-    UNUSED_PARAM(url);
-#else
-    url = getNonEmptyURLAttribute(srcAttr);
-    if (!isSafeToLoadURL(url, Complain))
-        url = selectNextSourceChild(0, 0, DoNothing);
-
-    m_currentSrc = url;
-    if (url.isValid() && frame && frame->loader().willLoadMediaElementURL(url)) {
-        names.append(ASCIILiteral("_media_element_src_"));
-        values.append(m_currentSrc.string());
-    }
-#endif
-
-#if PLATFORM(IOS)
-    Settings* settings = document().settings();
-    if (settings && settings->mediaPlaybackAllowsInline() && (applicationIsDumpRenderTree() || fastHasAttribute(webkit_playsinlineAttr))) {
-        names.append(ASCIILiteral("_media_element_allow_inline_"));
-        values.append(ASCIILiteral("true"));
-    }
-
-    String airplay = fastGetAttribute(webkitairplayAttr);
-    if (equalIgnoringCase(airplay, "allow") || equalIgnoringCase(airplay, "deny")) {
-        names.append(ASCIILiteral("_media_element_airplay_"));
-        values.append(airplay.lower());
-    }
-
-    if (fastHasAttribute(data_youtube_idAttr)) {
-        names.append(ASCIILiteral("_media_element_youtube_video_id_"));
-        values.append(fastGetAttribute(data_youtube_idAttr));
-    }
-
-    String interfaceName = settings ? settings->networkInterfaceName() : String();
-    if (!interfaceName.isEmpty()) {
-        names.append(ASCIILiteral("_media_element_network_interface_name"));
-        values.append(interfaceName);
-    }
-
-    if (fastHasAttribute(titleAttr)) {
-        names.append(titleAttr.toString());
-        values.append(fastGetAttribute(titleAttr));
-    }
-#endif
-
-#if ENABLE(IOS_AIRPLAY)
-    if (isVideo() && fastHasAttribute(webkitwirelessvideoplaybackdisabledAttr)) {
-        names.append(ASCIILiteral("_media_element_wireless_video_playback_disabled"));
-        values.append(ASCIILiteral("true"));
-    }
-#endif
-}
-
-void HTMLMediaElement::createMediaPlayerProxy()
-{
-    ensureMediaPlayer();
-
-    if (m_proxyWidget || (inDocument() && !m_needWidgetUpdate))
-        return;
-
-    Frame* frame = document().frame();
-    if (!frame)
-        return;
-
-    LOG(Media, "HTMLMediaElement::createMediaPlayerProxy");
-
-    URL url;
-    Vector<String> paramNames;
-    Vector<String> paramValues;
-
-    getPluginProxyParams(url, paramNames, paramValues);
-    
-    // Hang onto the proxy widget so it won't be destroyed if the plug-in is set to
-    // display:none
-    m_proxyWidget = frame->loader().subframeLoader().loadMediaPlayerProxyPlugin(*this, url, paramNames, paramValues);
-    if (m_proxyWidget)
-        m_needWidgetUpdate = false;
-}
-
-void HTMLMediaElement::updateWidget(PluginCreationOption)
-{
-    setNeedWidgetUpdate(false);
-
-    // FIXME: What if document().frame() is 0?
-
-    URL url;
-    Vector<String> paramNames;
-    Vector<String> paramValues;
-
-    getPluginProxyParams(url, paramNames, paramValues);
-    SubframeLoader& loader = document().frame()->loader().subframeLoader();
-    loader.loadMediaPlayerProxyPlugin(*this, url, paramNames, paramValues);
-}
-
-#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 
 #if ENABLE(IOS_AIRPLAY)
@@ -5414 +5136 @@
 void HTMLMediaElement::configureMediaControls()
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy()) {
-        if (m_player)
-            m_player->setControls(controls());
-
-        if (!hasMediaControls() && inDocument())
-            createMediaControls();
-        return;
-    }
-#endif
-
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
     if (!controls() || !inDocument())
@@ -5940 +5651 @@
 }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool HTMLMediaElement::shouldUseVideoPluginProxy() const
-{
-    return document().settings() && document().settings()->isVideoPluginProxyEnabled();
-}
-#endif
-
 #if ENABLE(MEDIA_SOURCE)
 RefPtr<VideoPlaybackQuality> HTMLMediaElement::getVideoPlaybackQuality()
@@ -6024 +5728 @@
 {
     LOG(Media, "HTMLMediaElement::didAddUserAgentShadowRoot");
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    // JavaScript controls are not enabled with the video plugin proxy.
-    if (shouldUseVideoPluginProxy())
-        return;
-#endif
     Page* page = document().page();
     if (!page)

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -36 +36 @@
 #include "MediaPlayer.h"
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLFrameOwnerElement.h"
-#include "HTMLPlugInImageElement.h"
-#include "MediaPlayerProxy.h"
-#endif
-
 #if ENABLE(VIDEO_TRACK)
 #include "AudioTrack.h"
@@ -74 +68 @@
 class PageActivityAssertionToken;
 class TimeRanges;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-class Widget;
-#endif
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 class MediaKeys;
@@ -99 +90 @@
 
 class HTMLMediaElement
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    : public HTMLFrameOwnerElement
-#else
     : public HTMLElement
-#endif
     , private MediaPlayerClient, public MediaPlayerSupportsTypeClient, private MediaCanStartListener, public ActiveDOMObject, public MediaControllerInterface , public MediaSessionClient
 #if ENABLE(VIDEO_TRACK)
@@ -368 +355 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    void ensureMediaPlayer();
-    void setNeedWidgetUpdate(bool needWidgetUpdate) { m_needWidgetUpdate = needWidgetUpdate; }
-    void deliverNotification(MediaPlayerProxyNotificationType notification);
-    void setMediaPlayerProxy(WebMediaPlayerProxy* proxy);
-    void getPluginProxyParams(URL& url, Vector<String>& names, Vector<String>& values);
-    void createMediaPlayerProxy();
-    void updateWidget(PluginCreationOption);
-#endif
-
 #if ENABLE(IOS_AIRPLAY)
     void webkitShowPlaybackTargetPicker();
@@ -445 +422 @@
 
     void enteredOrExitedFullscreen() { configureMediaControls(); }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    bool shouldUseVideoPluginProxy() const;
-#endif
 
     unsigned long long fileSize() const;
@@ -768 +741 @@
 
     OwnPtr<MediaPlayer> m_player;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    RefPtr<Widget> m_proxyWidget;
-#endif
 
     MediaPlayer::Preload m_preload;
@@ -830 +800 @@
     bool m_closedCaptionsVisible : 1;
     bool m_webkitLegacyClosedCaptionOverride : 1;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    bool m_needWidgetUpdate : 1;
-#endif
-
     bool m_completelyLoaded : 1;
     bool m_havePreparedToPlay : 1;

trunk/Source/WebCore/html/HTMLMediaSession.cpp

@@ -182 +182 @@
         return;
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (element.shouldUseVideoPluginProxy()) {
-        MediaPlayer* player = element.player();
-        if (!player)
-            return;
-
-        player->showPlaybackTargetPicker();
-        return;
-    }
-#endif
-
 #if PLATFORM(IOS)
     element.document().frame()->page()->chrome().client().showPlaybackTargetPicker(element.hasVideo());
@@ -200 +189 @@
 bool HTMLMediaSession::hasWirelessPlaybackTargets(const HTMLMediaElement& element) const
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (element.shouldUseVideoPluginProxy()) {
-        MediaPlayer* player = element.player();
-        if (!player)
-            return false;
-
-        return player->hasWirelessPlaybackTargets();
-    }
-#else
     UNUSED_PARAM(element);
-#endif
 
     bool hasTargets = MediaSessionManager::sharedManager().hasWirelessTargetsAvailable();
@@ -267 +246 @@
 {
     LOG(Media, "HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners - hasListeners %s", hasListeners ? "TRUE" : "FALSE");
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (element.shouldUseVideoPluginProxy()) {
-        MediaPlayer* player = element.player();
-        if (!player)
-            return;
-        
-        player->setHasPlaybackTargetAvailabilityListeners(hasListeners);
-        return;
-    }
-#else
     UNUSED_PARAM(element);
-#endif
 
     if (hasListeners)

trunk/Source/WebCore/html/HTMLVideoElement.cpp

@@ -70 +70 @@
 RenderPtr<RenderElement> HTMLVideoElement::createElementRenderer(PassRef<RenderStyle> style)
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy())
-        return HTMLMediaElement::createElementRenderer(std::move(style));
-#endif
     return createRenderer<RenderVideo>(*this, std::move(style));
 }
@@ -81 +77 @@
     HTMLMediaElement::didAttachRenderers();
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (!shouldUseVideoPluginProxy()) {
-#endif
-        updateDisplayState();
-        if (shouldDisplayPosterImage()) {
-            if (!m_imageLoader)
-                m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
-            m_imageLoader->updateFromElement();
-            if (renderer())
-                toRenderImage(renderer())->imageResource().setCachedImage(m_imageLoader->image());
-        }
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    }
-#endif
+    updateDisplayState();
+    if (shouldDisplayPosterImage()) {
+        if (!m_imageLoader)
+            m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
+        m_imageLoader->updateFromElement();
+        if (renderer())
+            toRenderImage(renderer())->imageResource().setCachedImage(m_imageLoader->image());
+    }
 }
 
@@ -120 +110 @@
         HTMLMediaElement::setDisplayMode(Unknown);
         updateDisplayState();
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        if (shouldUseVideoPluginProxy())
-            return;
-#endif
+
         if (shouldDisplayPosterImage()) {
             if (!m_imageLoader)
@@ -231 +218 @@
     }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (shouldUseVideoPluginProxy())
-        return;
-#endif
     if (renderer() && displayMode() != oldMode)
         renderer()->updateFromElement();

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -56 +56 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "RenderWidget.h"
-#endif
-
 #if ENABLE(WEBVTT_REGIONS)
 #include "VTTRegionList.h"
@@ -1442 +1438 @@
         videoBox = m_textTrackRepresentation->bounds();
     else {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        if (!mediaElement->renderer() || !mediaElement->renderer()->isWidget())
-            return;
-        videoBox = pixelSnappedIntRect(toRenderWidget(mediaElement->renderer())->contentBoxRect());
-#else
         if (!mediaElement->renderer() || !mediaElement->renderer()->isVideo())
             return;
         videoBox = toRenderVideo(*mediaElement->renderer()).videoBox();
-#endif
     }
 

trunk/Source/WebCore/loader/EmptyClients.cpp

@@ -159 +159 @@
 }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> EmptyFrameLoaderClient::createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&)
-{
-    return 0;
-}
-#endif
-
 PassRefPtr<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
 {

trunk/Source/WebCore/loader/EmptyClients.h

@@ -369 +369 @@
     virtual void recreatePlugin(Widget*) override;
     virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&) override;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&) override;
-    virtual void hideMediaPlayerProxyPlugin(Widget*) override { }
-    virtual void showMediaPlayerProxyPlugin(Widget*) override { }
-#endif
 
     virtual ObjectContentType objectContentType(const URL&, const String&, bool) override { return ObjectContentType(); }

trunk/Source/WebCore/loader/FrameLoaderClient.h

@@ -73 +73 @@
     class HTMLFormElement;
     class HTMLFrameOwnerElement;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    class HTMLMediaElement;
-#endif
     class HTMLPlugInElement;
     class IntSize;
@@ -275 +272 @@
 
         virtual void dispatchDidFailToStartPlugin(const PluginView*) const { }
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&) = 0;
-        virtual void hideMediaPlayerProxyPlugin(Widget*) = 0;
-        virtual void showMediaPlayerProxyPlugin(Widget*) = 0;
-#endif
 
         virtual ObjectContentType objectContentType(const URL&, const String& mimeType, bool shouldPreferPlugInsForImages) = 0;

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -57 +57 @@
 #include "Settings.h"
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#include "RenderVideo.h"
-#endif
-
 namespace WebCore {
     
@@ -233 +228 @@
     return loadOrRedirectSubframe(ownerElement, completedURL, frameName, LockHistory::Yes, LockBackForwardList::Yes);
 }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(HTMLMediaElement& mediaElement, const URL& url, const Vector<String>& paramNames, const Vector<String>& paramValues)
-{
-    ASSERT(mediaElement.hasTagName(videoTag) || isHTMLAudioElement(mediaElement));
-
-    URL completedURL;
-    if (!url.isEmpty())
-        completedURL = completeURL(url);
-
-    if (!m_frame.document()->securityOrigin()->canDisplay(completedURL)) {
-        FrameLoader::reportLocalLoadFailed(&m_frame, completedURL.string());
-        return nullptr;
-    }
-
-    if (!m_frame.document()->contentSecurityPolicy()->allowMediaFromSource(completedURL))
-        return nullptr;
-
-    RenderWidget* renderer = toRenderWidget(mediaElement.renderer());
-    IntSize size;
-
-    if (renderer)
-        size = roundedIntSize(LayoutSize(renderer->contentWidth(), renderer->contentHeight()));
-    else if (mediaElement.isVideo())
-        size = RenderVideo::defaultSize();
-
-    if (!m_frame.loader().mixedContentChecker().canRunInsecureContent(m_frame.document()->securityOrigin(), completedURL))
-        return nullptr;
-
-    RefPtr<Widget> widget = m_frame.loader().client().createMediaPlayerProxyPlugin(size, &mediaElement, completedURL, paramNames, paramValues, "application/x-media-element-proxy-plugin");
-
-    if (widget && renderer) {
-        renderer->setWidget(widget);
-        renderer->frameOwnerElement().setNeedsStyleRecalc(SyntheticStyleChange);
-    }
-    m_containsPlugins = true;
-
-    return widget ? widget.release() : nullptr;
-}
-#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 
 PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
@@ -458 +413 @@
     renderer->setWidget(widget);
     m_containsPlugins = true;
- 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    pluginElement.setNeedsStyleRecalc(SyntheticStyleChange);
-#endif
     return true;
 }

trunk/Source/WebCore/loader/SubframeLoader.h

@@ -64 +64 @@
         const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    PassRefPtr<Widget> loadMediaPlayerProxyPlugin(HTMLMediaElement&, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues);
-#endif
-
     PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -105 +105 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
 namespace WebCore {
 
@@ -2665 +2661 @@
         if (pluginElement.needsWidgetUpdate())
             pluginElement.updateWidget(CreateAnyWidgetType);
-    }
-
-    // FIXME: It is not clear that Media elements need or want this updateWidget() call.
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    else if (element.isMediaElement())
-        toHTMLMediaElement(element).updateWidget(CreateAnyWidgetType);
-#endif
-    else
+    } else
         ASSERT_NOT_REACHED();
 

trunk/Source/WebCore/page/Settings.cpp

@@ -83 +83 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool Settings::gVideoPluginProxyEnabled = true;
-#endif
-
 bool Settings::gMockScrollbarsEnabled = false;
 bool Settings::gUsesOverlayScrollbars = false;
@@ -601 +597 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-void Settings::setVideoPluginProxyEnabled(bool enabled)
-{
-    if (gVideoPluginProxyEnabled == enabled)
-        return;
-
-    gVideoPluginProxyEnabled = enabled;
-    HTMLMediaElement::resetMediaEngines();
-}
-#endif
-
 void Settings::setScrollingPerformanceLoggingEnabled(bool enabled)
 {

trunk/Source/WebCore/page/Settings.h

@@ -251 +251 @@
     static void setLowPowerVideoAudioBufferSizeEnabled(bool);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    static void setVideoPluginProxyEnabled(bool flag);
-    static bool isVideoPluginProxyEnabled() { return gVideoPluginProxyEnabled; }
-#endif
-
 #if PLATFORM(IOS)
     static void setAudioSessionCategoryOverride(unsigned);
@@ -361 +356 @@
 
     static bool gLowPowerVideoAudioBufferSizeEnabled;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    static bool gVideoPluginProxyEnabled;
-#endif
 };
 

trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h

@@ -100 +100 @@
     virtual bool shouldTemporarilyRetainTileCohorts(const GraphicsLayer*) const { return true; }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual bool mediaLayerMustBeUpdatedOnMainThread() const { return false; }
-#endif
-
 #ifndef NDEBUG
     // RenderLayerBacking overrides this to verify that it is not

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -145 +145 @@
     virtual void setPoster(const String&) { }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual void deliverNotification(MediaPlayerProxyNotificationType) { }
-    virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) { }
-    virtual void setControls(bool) { }
-#endif
-
     virtual bool hasSingleSecurityOrigin() const { return true; }
 
@@ -213 +207 @@
 
     enginesQueried = true;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (Settings::isVideoPluginProxyEnabled())
-        MediaPlayerPrivateIOS::registerMediaEngine(addMediaEngine);
-#endif
 
 #if USE(AVFOUNDATION)
@@ -341 +330 @@
     , m_shouldPrepareToRender(false)
     , m_contentMIMETypeWasInferredFromExtension(false)
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    , m_playerProxy(0)
-#endif
-{
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    Vector<MediaPlayerFactory*>& engines = installedMediaEngines();
-    if (Settings::isVideoPluginProxyEnabled() && !engines.isEmpty()) {
-        m_currentMediaEngine = engines[0];
-        m_private = engines[0]->constructor(this);
-        if (m_mediaPlayerClient)
-            m_mediaPlayerClient->mediaPlayerEngineUpdated(this);
-    }
-#endif
+{
 }
 
@@ -447 +424 @@
         if (m_mediaPlayerClient)
             m_mediaPlayerClient->mediaPlayerEngineUpdated(this);
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        m_private->setMediaPlayerProxy(m_playerProxy);
-#endif
         m_private->setPrivateBrowsingMode(m_privateBrowsing);
         m_private->setPreload(m_preload);
@@ -858 +832 @@
 } 
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-void MediaPlayer::deliverNotification(MediaPlayerProxyNotificationType notification)
-{
-    m_private->deliverNotification(notification);
-}
-
-void MediaPlayer::setMediaPlayerProxy(WebMediaPlayerProxy* proxy)
-{
-    m_playerProxy = proxy;
-    m_private->setMediaPlayerProxy(proxy);
-}
-
-void MediaPlayer::setControls(bool controls)
-{
-    m_private->setControls(controls);
-}
-#endif
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
 void MediaPlayer::enterFullscreen()
 {

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -29 +29 @@
 #if ENABLE(VIDEO)
 #include "GraphicsTypes3D.h"
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "MediaPlayerProxy.h"
-#endif
 
 #include "AudioTrackPrivate.h"
@@ -452 +449 @@
     void setPoster(const String&);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    void deliverNotification(MediaPlayerProxyNotificationType notification);
-    void setMediaPlayerProxy(WebMediaPlayerProxy* proxy);
-    void setControls(bool);
-#endif
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
     void enterFullscreen();
     void exitFullscreen();
@@ -612 +603 @@
     bool m_shouldPrepareToRender;
     bool m_contentMIMETypeWasInferredFromExtension;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    WebMediaPlayerProxy* m_playerProxy;    // not owned or used, passed to m_private
-#endif
 
 #if ENABLE(MEDIA_SOURCE)

trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -143 +143 @@
     virtual void setPoster(const String&) { }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual void deliverNotification(MediaPlayerProxyNotificationType) { }
-    virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) { }
-    virtual void setControls(bool) { }
-#endif
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
+#if USE(NATIVE_FULLSCREEN_VIDEO)
     virtual void enterFullscreen() { }
     virtual void exitFullscreen() { }

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1554 +1554 @@
         FloatRect layerBounds(m_boundsOrigin, m_size);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        // FIXME: Consider moving the main thread logic into PlatformCALayer.
-        if (mediaLayerMustBeUpdatedOnMainThread() && WebThreadIsCurrent()) {
-            m_structuralLayer->setPositionOnMainThread(layerPosition);
-            m_structuralLayer->setBoundsOnMainThread(layerBounds);
-            m_structuralLayer->setAnchorPointOnMainThread(m_anchorPoint);
-        } else {
-#endif
         m_structuralLayer->setPosition(layerPosition);
         m_structuralLayer->setBounds(layerBounds);
         m_structuralLayer->setAnchorPoint(m_anchorPoint);
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        }
-#endif
 
         if (LayerMap* layerCloneMap = m_structuralLayerClones.get()) {
@@ -1592 +1581 @@
     }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    // FIXME: Consider moving the main thread logic into PlatformCALayer.
-    if (mediaLayerMustBeUpdatedOnMainThread() && WebThreadIsCurrent()) {
-        m_layer->setPositionOnMainThread(adjustedPosition);
-        m_layer->setBoundsOnMainThread(adjustedBounds);
-        m_layer->setAnchorPointOnMainThread(scaledAnchorPoint);
-    } else {
-#endif
     m_layer->setPosition(adjustedPosition);
     m_layer->setBounds(adjustedBounds);
     m_layer->setAnchorPoint(scaledAnchorPoint);
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    }
-#endif
 
     if (LayerMap* layerCloneMap = m_layerClones.get()) {
@@ -2095 +2073 @@
         noteSublayersChanged(DontScheduleFlush);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    // FIXME: Consider moving the main thread logic into PlatformCALayer.
-    if (mediaLayerMustBeUpdatedOnMainThread() && WebThreadIsCurrent()) {
-        m_contentsLayer->setPositionOnMainThread(contentOrigin);
-        m_contentsLayer->setBoundsOnMainThread(contentBounds);
-    } else {
-#endif
     m_contentsLayer->setPosition(contentOrigin);
     m_contentsLayer->setBounds(contentBounds);
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) 
-    }
-#endif
 
     if (m_contentsLayerClones) {
@@ -3224 +3192 @@
 }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool GraphicsLayerCA::mediaLayerMustBeUpdatedOnMainThread() const
-{
-    if (m_contentsLayerPurpose != ContentsLayerForMedia)
-        return false;
-
-    return m_client && m_client->mediaLayerMustBeUpdatedOnMainThread();
-}
-#endif
-
 PassRefPtr<PlatformCALayer> GraphicsLayerCA::findOrMakeClone(CloneID cloneID, PlatformCALayer *sourceLayer, LayerMap* clones, CloneLevel cloneLevel)
 {

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -275 +275 @@
     void setupContentsLayer(PlatformCALayer*);
     PlatformCALayer* contentsLayer() const { return m_contentsLayer.get(); }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    bool mediaLayerMustBeUpdatedOnMainThread() const;
-#endif
 
     virtual void setReplicatedByLayer(GraphicsLayer*) override;

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -59 +59 @@
 #include <wtf/StackStats.h>
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
 namespace WebCore {
 
@@ -654 +650 @@
 bool RenderEmbeddedObject::canHaveChildren() const
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (frameOwnerElement().isMediaElement())
-        return true;
-#endif
-
     if (isSnapshottedPlugIn())
         return true;

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -2606 +2606 @@
 }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool RenderLayerBacking::mediaLayerMustBeUpdatedOnMainThread() const
-{
-    return renderer().frame().page() && renderer().frame().page()->settings().isVideoPluginProxyEnabled();
-}
-#endif
-
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderLayerBacking.h

@@ -192 +192 @@
     virtual bool shouldTemporarilyRetainTileCohorts(const GraphicsLayer*) const override;
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual bool mediaLayerMustBeUpdatedOnMainThread() const override;
-#endif
-
 #ifndef NDEBUG
     virtual void verifyNotPainting();

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -74 +74 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLAudioElement.h"
-#include "HTMLMediaElement.h"
-#endif
-
 #ifndef NDEBUG
 #include "RenderTreeAsText.h"
@@ -2357 +2352 @@
         return (video.requiresImmediateCompositing() || video.shouldDisplayVideo()) && canAccelerateVideoRendering(video);
     }
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    if (renderer.isWidget()) {
-        if (!m_hasAcceleratedCompositing)
-            return false;
-
-        Element* element = renderer.element();
-        if (!element || (!isHTMLVideoElement(element) && !isHTMLAudioElement(element)))
-            return false;
-
-        HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
-        return mediaElement->player() ? mediaElement->player()->supportsAcceleratedRendering() : false;
-    }
-#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 #else
     UNUSED_PARAM(renderer);

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=132396
+
+        Reviewed by Eric Carlson.
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Plugins/WebPluginContainerPrivate.h:
+        * Plugins/WebPluginController.h:
+        * Plugins/WebPluginController.mm:
+        (-[WebPluginController dealloc]):
+        (-[WebPluginController plugInsAreRunning]):
+        (-[WebPluginController stopAllPlugins]):
+        (-[WebPluginController stopPluginsForPageCache]):
+        (-[WebPluginController restorePluginsFromCache]):
+        (-[WebPluginController addPlugin:]):
+        (-[WebPluginController destroyPlugin:]):
+        (-[WebPluginController destroyAllPlugins]):
+        (-[NSView isMediaPlugInProxyView]): Deleted.
+        (-[NSView setIsMediaPlugInProxyView:]): Deleted.
+        (-[WebPluginController mediaPlugInProxyViewCreated:]): Deleted.
+        (+[WebPluginController pluginViewHidden:]): Deleted.
+        (mediaProxyClient): Deleted.
+        (-[WebPluginController _webPluginContainerSetMediaPlayerProxy:forElement:]): Deleted.
+        (-[WebPluginController _webPluginContainerPostMediaPlayerNotification:forElement:]): Deleted.
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (pluginView):
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+        (-[WebView _videoProxyPluginForMIMEType:]): Deleted.
+        * WebView/WebViewInternal.h:
+
 2014-04-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

@@ -161 +161 @@
 ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_$(PLATFORM_NAME));
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos = ENABLE_PLUGIN_PROXY_FOR_VIDEO;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphonesimulator = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos);
 ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
 ENABLE_PROMISES = ENABLE_PROMISES;
@@ -242 +239 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h

@@ -33 +33 @@
 #endif
 
-#if !TARGET_OS_IPHONE
-#if !defined(ENABLE_PLUGIN_PROXY_FOR_VIDEO)
-#define ENABLE_PLUGIN_PROXY_FOR_VIDEO 0
-#endif
-#endif
-
-#if ENABLE_PLUGIN_PROXY_FOR_VIDEO
-@class WebMediaPlayerProxy;
-#endif
-
 @interface NSObject (WebPlugInContainerPrivate)
 
@@ -48 +38 @@
 
 - (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)checkIdentifier;
-
-#if ENABLE_PLUGIN_PROXY_FOR_VIDEO
-- (void)_webPluginContainerSetMediaPlayerProxy:(WebMediaPlayerProxy *)proxy forElement:(DOMElement *)element;
-
-- (void)_webPluginContainerPostMediaPlayerNotification:(int)notification forElement:(DOMElement *)element;
-#endif
 
 #if TARGET_OS_IPHONE

trunk/Source/WebKit/mac/Plugins/WebPluginController.h

@@ -46 +46 @@
     BOOL _started;
     NSMutableSet *_checksInProgress;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    NSMutableArray *_viewsNotInDocument;
-#endif
 }
 
@@ -64 +61 @@
 - (void)addPlugin:(NSView *)view;
 - (void)destroyPlugin:(NSView *)view;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (void)mediaPlugInProxyViewCreated:(NSView *)view;
-+ (void)pluginViewHidden:(NSView *)view;
-#endif
 
 #if PLATFORM(IOS)

trunk/Source/WebKit/mac/Plugins/WebPluginController.mm

@@ -119 +119 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-@interface NSView (WebPluginControllerAdditions)
-@property (nonatomic) BOOL isMediaPlugInProxyView;
-@end
-
-@implementation NSView (WebPluginControllerAdditions)
-
-- (BOOL)isMediaPlugInProxyView
-{
-    return [(NSNumber *)objc_getAssociatedObject(self, @selector(isMediaPlugInProxyView)) boolValue];
-}
-
-- (void)setIsMediaPlugInProxyView:(BOOL)isMediaPlugInProxyView
-{
-    objc_setAssociatedObject(self, @selector(isMediaPlugInProxyView), [NSNumber numberWithBool:isMediaPlugInProxyView], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-@end
-#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-
 @implementation WebPluginController
 
@@ -235 +215 @@
     [_views release];
     [_checksInProgress release];
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    [_viewsNotInDocument release];
-#endif
     [super dealloc];
 }
@@ -245 +222 @@
 {
     NSUInteger pluginViewCount = [_views count];
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    pluginViewCount += [_viewsNotInDocument count];
-#endif
     return _started && pluginViewCount;
 }
@@ -335 +309 @@
         [self stopOnePlugin:[_views objectAtIndex:i]];
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    int viewsNotInDocumentCount = [_viewsNotInDocument count];
-    for (int i = 0; i < viewsNotInDocumentCount; i++)
-        [self stopOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
-#endif
-
     _started = NO;
 }
@@ -357 +325 @@
         [self stopOnePluginForPageCache:[_views objectAtIndex:i]];
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    NSUInteger viewsNotInDocumentCount = [_viewsNotInDocument count];
-    for (NSUInteger i = 0; i < viewsNotInDocumentCount; ++i)
-        [self stopOnePluginForPageCache:[_viewsNotInDocument objectAtIndex:i]];
-#endif
-
     _started = NO;
 }
@@ -376 +338 @@
     for (NSUInteger i = 0; i < viewsCount; ++i)
         [[webView _UIKitDelegateForwarder] webView:webView willAddPlugInView:[_views objectAtIndex:i]];
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    NSUInteger viewsNotInDocumentCount = [_viewsNotInDocument count];
-    for (NSUInteger i = 0; i < viewsNotInDocumentCount; ++i)
-        [[webView _UIKitDelegateForwarder] webView:webView willAddPlugInView:[_viewsNotInDocument objectAtIndex:i]];
-#endif
 }
 #endif // PLATFORM(IOS)
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (void)mediaPlugInProxyViewCreated:(NSView *)view
-{
-    view.isMediaPlugInProxyView = YES;
-    if (!_viewsNotInDocument)
-        _viewsNotInDocument= [[NSMutableArray alloc] init];
-    if (![_viewsNotInDocument containsObject:view])
-        [_viewsNotInDocument addObject:view];
-}
-
-+ (void)pluginViewHidden:(NSView *)view
-{
-    [pluginViews removeObject:view];
-}
-#endif
 
 - (void)addPlugin:(NSView *)view
@@ -412 +352 @@
 #if !PLATFORM(IOS)
         [[_documentView _webView] addPluginInstanceView:view];
-#endif
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        if ([_viewsNotInDocument containsObject:view])
-            [_viewsNotInDocument removeObject:view];
 #endif
 
@@ -462 +397 @@
 - (void)destroyPlugin:(NSView *)view
 {
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    // destroyPlugin: is called when a plug-in view is removed from its parent
-    // view, but native media players continue to exist even when they aren't in
-    // the view hierarchy. So if this plug-in view is a proxy for a native media
-    // player, don't destroy it here.
-    if (view.isMediaPlugInProxyView)
-        return;
-#endif
-
     if ([_views containsObject:view]) {
         if (_started)
             [self stopOnePlugin:view];
         [self destroyOnePlugin:view];
-        
+
 #if ENABLE(NETSCAPE_PLUGIN_API)
         if (Frame* frame = core([self webFrame]))
@@ -534 +460 @@
 #endif
     }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    int viewsNotInDocumentCount = [_viewsNotInDocument count];
-    for (int i = 0; i < viewsNotInDocumentCount; i++)
-        [self destroyOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
-#endif
 
 #if !PLATFORM(IOS)
@@ -701 +621 @@
         [pluginView webPlugInMainResourceDidFinishLoading];
 }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-static WebCore::HTMLMediaElement* mediaProxyClient(DOMElement* element)
-{
-    if (!element) {
-        LOG_ERROR("nil element passed");
-        return nil;
-    }
-
-    Element* node = core(element);
-    if (!node || (!isHTMLVideoElement(node) && !isHTMLAudioElement(node))) {
-        LOG_ERROR("invalid media element passed");
-        return nil;
-    }
-
-    return static_cast<WebCore::HTMLMediaElement*>(node);
-}
-
-- (void)_webPluginContainerSetMediaPlayerProxy:(WebMediaPlayerProxy *)proxy forElement:(DOMElement *)element
-{
-#if PLATFORM(IOS)
-    WebThreadRun(^{
-#endif
-    WebCore::HTMLMediaElement* client = mediaProxyClient(element);
-    if (client)
-        client->setMediaPlayerProxy(proxy);
-#if PLATFORM(IOS)
-    });
-#endif
-}
-
-- (void)_webPluginContainerPostMediaPlayerNotification:(int)notification forElement:(DOMElement *)element
-{
-#if PLATFORM(IOS)
-    WebThreadRun(^{
-#endif
-    WebCore::HTMLMediaElement* client = mediaProxyClient(element);
-    if (client)
-        client->deliverNotification((MediaPlayerProxyNotificationType)notification);
-#if PLATFORM(IOS)
-    });
-#endif
-}
-#endif
 
 @end

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

@@ -209 +209 @@
         const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
     
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual PassRefPtr<WebCore::Widget> createMediaPlayerProxyPlugin(const WebCore::IntSize&, WebCore::HTMLMediaElement*, const WebCore::URL&, 
-        const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&) override;
-    virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*) override;
-    virtual void showMediaPlayerProxyPlugin(WebCore::Widget*) override;
-#endif
-    
     virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;
     virtual WTF::String overrideMediaType() const override;

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -131 +131 @@
 #import <wtf/text/WTFString.h>
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#import <WebCore/HTMLMediaElement.h>
-#endif
-
 #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
 #import "NetscapePluginHostManager.h"
@@ -1737 +1733 @@
     view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
     [attributes release];
-
-    if (!view)
-        return nil;
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    Element* node = core(element);
-    if (node->hasTagName(HTMLNames::videoTag) || node->hasTagName(HTMLNames::audioTag))
-        [pluginController mediaPlugInProxyViewCreated:view];
-#endif
 #endif
 
@@ -1953 +1940 @@
 
 #if PLATFORM(IOS)
-    if (!pluginPackage && [extension length]) {
+    if (!pluginPackage && [extension length])
 #else
-    if (!pluginPackage && [extension length] && ![MIMEType length]) {
-#endif
+    if (!pluginPackage && [extension length] && ![MIMEType length])
+#endif
+    {
         pluginPackage = [webView _pluginForExtension:extension];
         if (pluginPackage) {
@@ -1975 +1963 @@
             if ([pluginPackage isKindOfClass:[WebPluginPackage class]])
                 view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, attributeKeys, kit(paramValues), baseURL, kit(element), loadManually);
-
 #if ENABLE(NETSCAPE_PLUGIN_API)
             else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
@@ -2106 +2093 @@
     if ([pluginView isKindOfClass:[NETSCAPE_PLUGIN_VIEW class]])
         [representation _redirectDataToManualLoader:(NETSCAPE_PLUGIN_VIEW *)pluginView forPluginView:pluginView];
-    else {
-#else
+    else
+#endif
     {
-#endif
         WebHTMLView *documentView = (WebHTMLView *)[[m_webFrame.get() frameView] documentView];
         ASSERT([documentView isKindOfClass:[WebHTMLView class]]);
@@ -2139 +2125 @@
                 toRenderEmbeddedObject(element->renderer())->setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
         } else {
-    #if ENABLE(NETSCAPE_PLUGIN_API)
+#if ENABLE(NETSCAPE_PLUGIN_API)
             if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
                 view = [[[NETSCAPE_PLUGIN_VIEW alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
@@ -2153 +2139 @@
                     return adoptRef(new NetscapePluginWidget(static_cast<WebBaseNetscapePluginView *>(view)));
             }
-    #endif
+#endif
         }
     }
@@ -2172 +2158 @@
     return 0;
 }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> WebFrameLoaderClient::createMediaPlayerProxyPlugin(const IntSize& size, HTMLMediaElement* element, const URL& url,
-    const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType)
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
-    ASSERT(paramNames.size() == paramValues.size());
-    ASSERT(mimeType);
-
-    int errorCode = 0;
-    WebView *webView = getWebView(m_webFrame.get());
-    NSURL *URL = url;
-
-#if !PLATFORM(IOS)
-    SEL selector = @selector(webView:plugInViewWithArguments:);
-
-    if ([[webView UIDelegate] respondsToSelector:selector]) {
-        NSMutableDictionary *attributes = [[NSMutableDictionary alloc] initWithObjects:kit(paramValues) forKeys:kit(paramNames)];
-        NSDictionary *arguments = [[NSDictionary alloc] initWithObjectsAndKeys:
-            attributes, WebPlugInAttributesKey,
-            [NSNumber numberWithInt:WebPlugInModeEmbed], WebPlugInModeKey,
-            [NSNumber numberWithBool:YES], WebPlugInShouldLoadMainResourceKey,
-            kit(element), WebPlugInContainingElementKey,
-            URL, WebPlugInBaseURLKey, // URL might be nil, so add it last
-            nil];
-
-        NSView *view = CallUIDelegate(webView, selector, arguments);
-
-        [attributes release];
-        [arguments release];
-
-        if (view)
-            return adoptRef(new PluginWidget(view));
-    }
-#endif
-
-    WebBasePluginPackage *pluginPackage = [webView _videoProxyPluginForMIMEType:mimeType];
-    Document* document = core(m_webFrame.get())->document();
-    NSURL *baseURL = document->baseURL();
-    NSView *view = nil;
-
-    if (pluginPackage) {
-        if ([pluginPackage isKindOfClass:[WebPluginPackage class]])
-            view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, kit(paramNames), kit(paramValues), baseURL, kit(element), false);
-    } else
-        errorCode = WebKitErrorCannotFindPlugIn;
-
-    if (!errorCode && !view)
-        errorCode = WebKitErrorCannotLoadPlugIn;
-
-    if (errorCode) {
-#if PLATFORM(IOS)
-        WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(getWebView(m_webFrame.get()));
-        if (implementations->plugInFailedWithErrorFunc) {
-            NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode contentURL:URL pluginPageURL:nil pluginName:[pluginPackage pluginInfo].name MIMEType:mimeType];
-            CallResourceLoadDelegate(implementations->plugInFailedWithErrorFunc, [m_webFrame.get() webView],
-                                     @selector(webView:plugInFailedWithError:dataSource:), error, [m_webFrame.get() _dataSource]);
-            [error release];
-        }
-#else
-        NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
-            contentURL:URL pluginPageURL:nil pluginName:[pluginPackage pluginInfo].name MIMEType:mimeType];
-        WebNullPluginView *nullView = [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
-            error:error DOMElement:kit(element)] autorelease];
-        view = nullView;
-        [error release];
-#endif
-    }
-    
-    ASSERT(view);
-#if PLATFORM(IOS)
-    return adoptRef(new PluginWidgetIOS(view));
-#else
-    return adoptRef(new PluginWidget(view));
-#endif
-
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    return 0;
-}
-
-void WebFrameLoaderClient::hideMediaPlayerProxyPlugin(Widget* widget)
-{
-    [WebPluginController pluginViewHidden:widget->platformWidget()];
-}
-
-void WebFrameLoaderClient::showMediaPlayerProxyPlugin(Widget* widget)
-{
-    [WebPluginController addPlugInView:widget->platformWidget()];
-}
-
-#endif  // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 
 String WebFrameLoaderClient::overrideMediaType() const

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -119 +119 @@
 #define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
 #define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
-#define WebKitVideoPluginProxyEnabledKey @"WebKitVideoPluginProxyEnabled"
 #define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
 #define WebKitMediaPlaybackRequiresUserGesturePreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -582 +582 @@
         
         [NSNumber numberWithBool:NO], WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey,
-        
-        [NSNumber numberWithBool:NO],   WebKitVideoPluginProxyEnabledKey,
 #if ENABLE(MEDIA_SOURCE)
         [NSNumber numberWithBool:YES], WebKitMediaSourceEnabledPreferenceKey,
@@ -2133 +2131 @@
 - (void)setVideoPluginProxyEnabled:(BOOL)flag
 {
-    [self _setBoolValue:flag forKey:WebKitVideoPluginProxyEnabledKey];
+    // No-op, left for SPI compatibility.
 }
 
 - (BOOL)isVideoPluginProxyEnabled
 {
-    return [self _boolValueForKey:WebKitVideoPluginProxyEnabledKey];
+    return NO;
 }
 

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -364 +364 @@
 - (BOOL)isQTKitEnabled;
 
-// VideoPluginProxy support is dependent on WebCore/WebKit being
-// compiled with ENABLE_PLUGIN_PROXY_FOR_VIDEO.
+// Deprecated, has no effect.
 - (void)setVideoPluginProxyEnabled:(BOOL)flag;
 - (BOOL)isVideoPluginProxyEnabled;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2385 +2385 @@
     settings.setUseLegacyTextAlignPositionedElementBehavior([preferences useLegacyTextAlignPositionedElementBehavior]);
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    settings.setVideoPluginProxyEnabled([preferences isVideoPluginProxyEnabled]);
-#endif
-
 #if ENABLE(MEDIA_SOURCE)
     settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
@@ -4859 +4855 @@
     return nil;
 }
-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (WebBasePluginPackage *)_videoProxyPluginForMIMEType:(NSString *)MIMEType
-{
-    WebBasePluginPackage *pluginPackage = [[WebPluginDatabase sharedDatabase] pluginForMIMEType:MIMEType];
-    if (pluginPackage)
-        return pluginPackage;
-
-#if !PLATFORM(IOS)
-    if (_private->pluginDatabase)
-        return [_private->pluginDatabase pluginForMIMEType:MIMEType];
-#endif
-
-    return nil;
-}
-#endif
 
 - (WebBasePluginPackage *)_pluginForExtension:(NSString *)extension

trunk/Source/WebKit/mac/WebView/WebViewInternal.h

@@ -191 +191 @@
 - (WebBasePluginPackage *)_pluginForMIMEType:(NSString *)MIMEType;
 - (WebBasePluginPackage *)_pluginForExtension:(NSString *)extension;
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (WebBasePluginPackage *)_videoProxyPluginForMIMEType:(NSString *)MIMEType;
-#endif
 
 - (void)setCurrentNodeHighlight:(WebNodeHighlight *)nodeHighlight;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-30  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=132396
+
+        Reviewed by Eric Carlson.
+        
+        Remove ENABLE_PLUGIN_PROXY_FOR_VIDEO and related code.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createMediaPlayerProxyPlugin): Deleted.
+        (WebKit::WebFrameLoaderClient::hideMediaPlayerProxyPlugin): Deleted.
+        (WebKit::WebFrameLoaderClient::showMediaPlayerProxyPlugin): Deleted.
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2014-04-30  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

@@ -161 +161 @@
 ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
 ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_$(PLATFORM_NAME));
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos = ENABLE_PLUGIN_PROXY_FOR_VIDEO;
-ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphonesimulator = $(ENABLE_PLUGIN_PROXY_FOR_VIDEO_iphoneos);
 ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
 ENABLE_PROMISES = ENABLE_PROMISES;
@@ -242 +239 @@
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1405 +1405 @@
 }
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> WebFrameLoaderClient::createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&)
-{
-    notImplemented();
-    return 0;
-}
-
-void WebFrameLoaderClient::hideMediaPlayerProxyPlugin(Widget*)
-{
-    notImplemented();
-}
-
-void WebFrameLoaderClient::showMediaPlayerProxyPlugin(Widget*)
-{
-    notImplemented();
-}
-#endif
-
 static bool pluginSupportsExtension(const PluginData& pluginData, const String& extension)
 {

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

@@ -194 +194 @@
     virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) override;
     
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    virtual PassRefPtr<WebCore::Widget> createMediaPlayerProxyPlugin(const WebCore::IntSize&, WebCore::HTMLMediaElement*, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&) override;
-    virtual void hideMediaPlayerProxyPlugin(WebCore::Widget*) override;
-    virtual void showMediaPlayerProxyPlugin(WebCore::Widget*) override;
-#endif
-
     virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType, bool shouldPreferPlugInsForImages) override;
     virtual String overrideMediaType() const override;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2613 +2613 @@
 #endif
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    settings.setVideoPluginProxyEnabled(false);
-#endif
-
 #if PLATFORM(IOS)
     settings.setAVKitEnabled(true);