<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168079] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168079">168079</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 19:19:33 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationcpp">trunk/Source/WebCore/dom/DOMImplementation.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTextIteratorcpp">trunk/Source/WebCore/editing/TextIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementcpp">trunk/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoadercpp">trunk/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoaderh">trunk/Source/WebCore/loader/SubframeLoader.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth">trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginContainerPrivateh">trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllerh">trunk/Source/WebKit/mac/Plugins/WebPluginController.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllermm">trunk/Source/WebKit/mac/Plugins/WebPluginController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Argument flush formats should not be presumed to be JSValue since 'this' is weird
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -160,9 +160,6 @@
</span><span class="cx"> ENABLE_PAGE_VISIBILITY_API = ENABLE_PAGE_VISIBILITY_API;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
</span><del>-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);
</del><span class="cx"> ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
</span><span class="cx"> ENABLE_PROMISES = ENABLE_PROMISES;
</span><span class="cx"> ENABLE_PROXIMITY_EVENTS = ;
</span><span class="lines">@@ -241,4 +238,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WTF/ChangeLog 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-30 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][GStreamer] Remove unnecessary GLIB_CHECK_VERSION #ifdefs
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -648,10 +648,6 @@
</span><span class="cx"> #define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_PLUGIN_PROXY_FOR_VIDEO)
-#define ENABLE_PLUGIN_PROXY_FOR_VIDEO 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_POINTER_LOCK)
</span><span class="cx"> #define ENABLE_POINTER_LOCK 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/ChangeLog 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1,5 +1,82 @@
</span><span class="cx"> 2014-04-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> [iOS WK2] Some accerated overflow-scroll doesn't scroll correctly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132375
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -160,9 +160,6 @@
</span><span class="cx"> ENABLE_PAGE_VISIBILITY_API = ENABLE_PAGE_VISIBILITY_API;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
</span><del>-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);
</del><span class="cx"> ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
</span><span class="cx"> ENABLE_PROMISES = ENABLE_PROMISES;
</span><span class="cx"> ENABLE_PROXIMITY_EVENTS = ;
</span><span class="lines">@@ -241,4 +238,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -3197,14 +3197,6 @@
</span><span class="cx"> __ZN7WebCore16ScriptController16createRootObjectEPv
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-__ZN7WebCore16HTMLMediaElement19deliverNotificationE32MediaPlayerProxyNotificationType
-__ZN7WebCore16HTMLMediaElement19setMediaPlayerProxyEP19WebMediaPlayerProxy
-__ZN7WebCore8Settings24gVideoPluginProxyEnabledE
-__ZN7WebCore8Settings26setVideoPluginProxyEnabledEb
-__ZN7WebCore9HTMLNames8audioTagE
-#endif
-
</del><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> __ZN7WebCore3macERKNS_15ProtectionSpaceE
</span><span class="cx"> __ZNK7WebCore15ProtectionSpace20authenticationSchemeEv
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -157,18 +157,10 @@
</span><span class="cx"> #include "DashboardRegion.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLAudioElement.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "WebVTTElement.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="lines">@@ -644,12 +636,6 @@
</span><span class="cx"> if (element->hasTagName(iframeTag) || element->hasTagName(frameTag) || element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag) || element->hasTagName(canvasTag))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> if (elementHasDirectionAuto(element))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/dom/DOMImplementation.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -331,21 +331,15 @@
</span><span class="cx"> return ImageDocument::create(*frame, url);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (!frame || !frame->settings().isVideoPluginProxyEnabled())
</del><ins>+ // 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);
</ins><span class="cx"> #endif
</span><del>- {
- // 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
</del><span class="cx">
</span><span class="cx"> // Everything else except text/plain can be overridden by plugins. In particular, Adobe SVG Viewer should be used for SVG, if installed.
</span><span class="cx"> // Disallowing plug-ins to use text/plain prevents plug-ins from hijacking a fundamental type that the browser is expected to handle,
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTextIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TextIterator.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TextIterator.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -249,21 +249,8 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> if (renderer->isImage() || renderer->isWidget() || renderer->isMedia())
</span><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (renderer->node() && renderer->node()->isElementNode()) {
</span><span class="cx"> Element& element = toElement(*renderer->node());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -83,12 +83,6 @@
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "RenderEmbeddedObject.h"
-#include "SubframeLoader.h"
-#include "Widget.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "AudioTrackList.h"
</span><span class="cx"> #include "HTMLTrackElement.h"
</span><span class="lines">@@ -255,11 +249,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- : HTMLFrameOwnerElement(tagName, document)
-#else
</del><span class="cx"> : HTMLElement(tagName, document)
</span><del>-#endif
</del><span class="cx"> , ActiveDOMObject(&document)
</span><span class="cx"> , m_loadTimer(this, &HTMLMediaElement::loadTimerFired)
</span><span class="cx"> , m_progressEventTimer(this, &HTMLMediaElement::progressEventTimerFired)
</span><span class="lines">@@ -283,9 +273,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_videoFullscreenGravity(MediaPlayer::VideoGravityResizeAspect)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- , m_proxyWidget(0)
-#endif
</del><span class="cx"> , m_preload(MediaPlayer::Auto)
</span><span class="cx"> , m_displayMode(Unknown)
</span><span class="cx"> , m_processingMediaPlayerCallback(0)
</span><span class="lines">@@ -318,9 +305,6 @@
</span><span class="cx"> , m_isFullscreen(false)
</span><span class="cx"> , m_closedCaptionsVisible(false)
</span><span class="cx"> , m_webkitLegacyClosedCaptionOverride(false)
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- , m_needWidgetUpdate(false)
-#endif
</del><span class="cx"> , m_completelyLoaded(false)
</span><span class="cx"> , m_havePreparedToPlay(false)
</span><span class="cx"> , m_parsingInProgress(createdByParser)
</span><span class="lines">@@ -655,13 +639,6 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLElement::finishParsingChildren();
</span><span class="cx"> m_parsingInProgress = false;
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy()) {
- document().updateStyleIfNeeded();
- createMediaPlayerProxy();
- }
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (!RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
</span><span class="lines">@@ -674,28 +651,11 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::rendererIsNeeded(const RenderStyle& style)
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- return true;
-#endif
</del><span class="cx"> return controls() && HTMLElement::rendererIsNeeded(style);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> HTMLMediaElement::createElementRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><del>-#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
</del><span class="cx"> return createRenderer<RenderMedia>(*this, std::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -772,23 +732,12 @@
</span><span class="cx"> void HTMLMediaElement::willAttachRenderers()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!renderer());
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- m_needWidgetUpdate = true;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::didAttachRenderers()
</span><span class="cx"> {
</span><span class="cx"> if (renderer())
</span><span class="cx"> renderer()->updateFromElement();
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- else if (m_proxyWidget) {
- if (Frame* frame = document().frame())
- frame->loader().client().hideMediaPlayerProxyPlugin(m_proxyWidget.get());
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::didRecalcStyle(Style::Change)
</span><span class="lines">@@ -802,11 +751,6 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::scheduleLoad");
</span><span class="cx">
</span><span class="cx"> if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaResource)) {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- createMediaPlayerProxy();
-#endif
-
</del><span class="cx"> prepareForLoad();
</span><span class="cx"> setFlags(m_pendingActionFlags, LoadMediaResource);
</span><span class="cx"> }
</span><span class="lines">@@ -981,14 +925,6 @@
</span><span class="cx"> closeMediaSource();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy()) {
- if (m_player)
- m_player->cancelLoad();
- else
- createMediaPlayerProxy();
- } else
-#endif
</del><span class="cx"> createMediaPlayer();
</span><span class="cx">
</span><span class="cx"> // 4 - If the media element's networkState is not set to NETWORK_EMPTY, then run these substeps
</span><span class="lines">@@ -1195,11 +1131,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (!shouldUseVideoPluginProxy())
-#endif
- // Recreate the media player for the new url
- createMediaPlayer();
</del><ins>+ // Recreate the media player for the new url
+ createMediaPlayer();
</ins><span class="cx">
</span><span class="cx"> m_loadState = LoadingFromSourceElement;
</span><span class="cx"> loadResource(mediaURL, contentType, keySystem);
</span><span class="lines">@@ -4505,16 +4438,7 @@
</span><span class="cx"> bool shouldBePlaying = potentiallyPlaying();
</span><span class="cx"> bool playerPaused = m_player->paused();
</span><span class="cx">
</span><del>-#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",
</del><ins>+ LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",
</ins><span class="cx"> boolString(shouldBePlaying), boolString(playerPaused));
</span><span class="cx">
</span><span class="cx"> if (shouldBePlaying) {
</span><span class="lines">@@ -4655,9 +4579,6 @@
</span><span class="cx"> closeMediaSource();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (!shouldUseVideoPluginProxy())
-#endif
</del><span class="cx"> m_player.clear();
</span><span class="cx">
</span><span class="cx"> stopPeriodicTimers();
</span><span class="lines">@@ -4780,27 +4701,12 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::defaultEventHandler(Event* event)
</span><span class="cx"> {
</span><del>-#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
</del><span class="cx"> HTMLElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> bool HTMLMediaElement::willRespondToMouseClickEvents()
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- return true;
-#endif
</del><span class="cx"> return HTMLElement::willRespondToMouseClickEvents();
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="lines">@@ -4818,191 +4724,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><del>- 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)
</del><span class="cx"> void HTMLMediaElement::webkitShowPlaybackTargetPicker()
</span><span class="cx"> {
</span><span class="cx"> m_mediaSession->showPlaybackTargetPicker(*this);
</span><span class="lines">@@ -5413,17 +5135,6 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::configureMediaControls()
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy()) {
- if (m_player)
- m_player->setControls(controls());
-
- if (!hasMediaControls() && inDocument())
- createMediaControls();
- return;
- }
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (!controls() || !inDocument())
</span><span class="cx"> return;
</span><span class="lines">@@ -5939,13 +5650,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool HTMLMediaElement::shouldUseVideoPluginProxy() const
-{
- return document().settings() && document().settings()->isVideoPluginProxyEnabled();
-}
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> RefPtr<VideoPlaybackQuality> HTMLMediaElement::getVideoPlaybackQuality()
</span><span class="cx"> {
</span><span class="lines">@@ -6023,11 +5727,6 @@
</span><span class="cx"> void HTMLMediaElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::didAddUserAgentShadowRoot");
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- // JavaScript controls are not enabled with the video plugin proxy.
- if (shouldUseVideoPluginProxy())
- return;
-#endif
</del><span class="cx"> Page* page = document().page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -35,12 +35,6 @@
</span><span class="cx"> #include "MediaControllerInterface.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLFrameOwnerElement.h"
-#include "HTMLPlugInImageElement.h"
-#include "MediaPlayerProxy.h"
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "AudioTrack.h"
</span><span class="cx"> #include "CaptionUserPreferences.h"
</span><span class="lines">@@ -73,9 +67,6 @@
</span><span class="cx"> class MediaError;
</span><span class="cx"> class PageActivityAssertionToken;
</span><span class="cx"> class TimeRanges;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-class Widget;
-#endif
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> class MediaKeys;
</span><span class="cx"> #endif
</span><span class="lines">@@ -98,11 +89,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> class HTMLMediaElement
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- : public HTMLFrameOwnerElement
-#else
</del><span class="cx"> : public HTMLElement
</span><del>-#endif
</del><span class="cx"> , private MediaPlayerClient, public MediaPlayerSupportsTypeClient, private MediaCanStartListener, public ActiveDOMObject, public MediaControllerInterface , public MediaSessionClient
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> , private AudioTrackClient
</span><span class="lines">@@ -367,16 +354,6 @@
</span><span class="cx"> void setTextTrackRepresentation(TextTrackRepresentation*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span><span class="cx"> void webkitShowPlaybackTargetPicker();
</span><span class="cx"> bool webkitCurrentPlaybackTargetIsWireless() const;
</span><span class="lines">@@ -445,10 +422,6 @@
</span><span class="cx">
</span><span class="cx"> void enteredOrExitedFullscreen() { configureMediaControls(); }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- bool shouldUseVideoPluginProxy() const;
-#endif
-
</del><span class="cx"> unsigned long long fileSize() const;
</span><span class="cx">
</span><span class="cx"> void mediaLoadingFailed(MediaPlayer::NetworkState);
</span><span class="lines">@@ -767,9 +740,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> OwnPtr<MediaPlayer> m_player;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- RefPtr<Widget> m_proxyWidget;
-#endif
</del><span class="cx">
</span><span class="cx"> MediaPlayer::Preload m_preload;
</span><span class="cx">
</span><span class="lines">@@ -829,11 +799,6 @@
</span><span class="cx"> bool m_isFullscreen : 1;
</span><span class="cx"> bool m_closedCaptionsVisible : 1;
</span><span class="cx"> bool m_webkitLegacyClosedCaptionOverride : 1;
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- bool m_needWidgetUpdate : 1;
-#endif
-
</del><span class="cx"> bool m_completelyLoaded : 1;
</span><span class="cx"> bool m_havePreparedToPlay : 1;
</span><span class="cx"> bool m_parsingInProgress : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -181,17 +181,6 @@
</span><span class="cx"> if (!showingPlaybackTargetPickerPermitted(element))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (element.shouldUseVideoPluginProxy()) {
- MediaPlayer* player = element.player();
- if (!player)
- return;
-
- player->showPlaybackTargetPicker();
- return;
- }
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> element.document().frame()->page()->chrome().client().showPlaybackTargetPicker(element.hasVideo());
</span><span class="cx"> #endif
</span><span class="lines">@@ -199,17 +188,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaSession::hasWirelessPlaybackTargets(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (element.shouldUseVideoPluginProxy()) {
- MediaPlayer* player = element.player();
- if (!player)
- return false;
-
- return player->hasWirelessPlaybackTargets();
- }
-#else
</del><span class="cx"> UNUSED_PARAM(element);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool hasTargets = MediaSessionManager::sharedManager().hasWirelessTargetsAvailable();
</span><span class="cx"> LOG(Media, "HTMLMediaSession::hasWirelessPlaybackTargets - returning %s", hasTargets ? "TRUE" : "FALSE");
</span><span class="lines">@@ -266,19 +245,7 @@
</span><span class="cx"> void HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners(const HTMLMediaElement& element, bool hasListeners)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners - hasListeners %s", hasListeners ? "TRUE" : "FALSE");
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (element.shouldUseVideoPluginProxy()) {
- MediaPlayer* player = element.player();
- if (!player)
- return;
-
- player->setHasPlaybackTargetAvailabilityListeners(hasListeners);
- return;
- }
-#else
</del><span class="cx"> UNUSED_PARAM(element);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (hasListeners)
</span><span class="cx"> MediaSessionManager::sharedManager().startMonitoringAirPlayRoutes();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -69,10 +69,6 @@
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> HTMLVideoElement::createElementRenderer(PassRef<RenderStyle> style)
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- return HTMLMediaElement::createElementRenderer(std::move(style));
-#endif
</del><span class="cx"> return createRenderer<RenderVideo>(*this, std::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,20 +76,14 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLMediaElement::didAttachRenderers();
</span><span class="cx">
</span><del>-#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)
</del><ins>+ 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());
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLVideoElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
</span><span class="lines">@@ -119,10 +109,7 @@
</span><span class="cx"> // Force a poster recalc by setting m_displayMode to Unknown directly before calling updateDisplayState.
</span><span class="cx"> HTMLMediaElement::setDisplayMode(Unknown);
</span><span class="cx"> updateDisplayState();
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- return;
-#endif
</del><ins>+
</ins><span class="cx"> if (shouldDisplayPosterImage()) {
</span><span class="cx"> if (!m_imageLoader)
</span><span class="cx"> m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
</span><span class="lines">@@ -230,10 +217,6 @@
</span><span class="cx"> player()->setPoster(poster);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (shouldUseVideoPluginProxy())
- return;
-#endif
</del><span class="cx"> if (renderer() && displayMode() != oldMode)
</span><span class="cx"> renderer()->updateFromElement();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -55,10 +55,6 @@
</span><span class="cx"> #include "TextTrackList.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "RenderWidget.h"
-#endif
-
</del><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> #include "VTTRegionList.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1441,15 +1437,9 @@
</span><span class="cx"> if (m_textTrackRepresentation)
</span><span class="cx"> videoBox = m_textTrackRepresentation->bounds();
</span><span class="cx"> else {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (!mediaElement->renderer() || !mediaElement->renderer()->isWidget())
- return;
- videoBox = pixelSnappedIntRect(toRenderWidget(mediaElement->renderer())->contentBoxRect());
-#else
</del><span class="cx"> if (!mediaElement->renderer() || !mediaElement->renderer()->isVideo())
</span><span class="cx"> return;
</span><span class="cx"> videoBox = toRenderVideo(*mediaElement->renderer()).videoBox();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!forceUpdate && m_videoDisplaySize == videoBox)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -158,13 +158,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> PassRefPtr<FrameNetworkingContext> EmptyFrameLoaderClient::createNetworkingContext()
</span><span class="cx"> {
</span><span class="cx"> return PassRefPtr<FrameNetworkingContext>();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -368,11 +368,6 @@
</span><span class="cx"> virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool) override;
</span><span class="cx"> virtual void recreatePlugin(Widget*) override;
</span><span class="cx"> virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&) override;
</span><del>-#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
</del><span class="cx">
</span><span class="cx"> virtual ObjectContentType objectContentType(const URL&, const String&, bool) override { return ObjectContentType(); }
</span><span class="cx"> virtual String overrideMediaType() const override { return String(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -72,9 +72,6 @@
</span><span class="cx"> class HTMLAppletElement;
</span><span class="cx"> class HTMLFormElement;
</span><span class="cx"> class HTMLFrameOwnerElement;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- class HTMLMediaElement;
-#endif
</del><span class="cx"> class HTMLPlugInElement;
</span><span class="cx"> class IntSize;
</span><span class="cx"> class URL;
</span><span class="lines">@@ -274,11 +271,6 @@
</span><span class="cx"> virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidFailToStartPlugin(const PluginView*) const { }
</span><del>-#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
</del><span class="cx">
</span><span class="cx"> virtual ObjectContentType objectContentType(const URL&, const String& mimeType, bool shouldPreferPlugInsForImages) = 0;
</span><span class="cx"> virtual String overrideMediaType() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> #include "SecurityPolicy.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#include "RenderVideo.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="lines">@@ -233,46 +228,6 @@
</span><span class="cx"> return loadOrRedirectSubframe(ownerElement, completedURL, frameName, LockHistory::Yes, LockBackForwardList::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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)
-
</del><span class="cx"> PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement& element, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><span class="cx"> String baseURLString;
</span><span class="lines">@@ -457,10 +412,6 @@
</span><span class="cx"> pluginElement.subframeLoaderDidCreatePlugIn(widget.get());
</span><span class="cx"> renderer->setWidget(widget);
</span><span class="cx"> m_containsPlugins = true;
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- pluginElement.setNeedsStyleRecalc(SyntheticStyleChange);
-#endif
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -63,10 +63,6 @@
</span><span class="cx"> bool requestObject(HTMLPlugInImageElement&, const String& url, const AtomicString& frameName,
</span><span class="cx"> const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues);
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- PassRefPtr<Widget> loadMediaPlayerProxyPlugin(HTMLMediaElement&, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues);
-#endif
-
</del><span class="cx"> PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
</span><span class="cx">
</span><span class="cx"> bool allowPlugins(ReasonForCallingAllowPlugins);
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -104,10 +104,6 @@
</span><span class="cx"> #include "SystemMemory.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="lines">@@ -2664,14 +2660,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (pluginElement.needsWidgetUpdate())
</span><span class="cx"> pluginElement.updateWidget(CreateAnyWidgetType);
</span><del>- }
-
- // 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
</del><ins>+ } else
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx">
</span><span class="cx"> // It's possible the renderer was destroyed below updateWidget() since loading a plugin may execute arbitrary JavaScript.
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -82,10 +82,6 @@
</span><span class="cx"> bool Settings::gQTKitEnabled = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool Settings::gVideoPluginProxyEnabled = true;
-#endif
-
</del><span class="cx"> bool Settings::gMockScrollbarsEnabled = false;
</span><span class="cx"> bool Settings::gUsesOverlayScrollbars = false;
</span><span class="cx">
</span><span class="lines">@@ -600,17 +596,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-void Settings::setVideoPluginProxyEnabled(bool enabled)
-{
- if (gVideoPluginProxyEnabled == enabled)
- return;
-
- gVideoPluginProxyEnabled = enabled;
- HTMLMediaElement::resetMediaEngines();
-}
-#endif
-
</del><span class="cx"> void Settings::setScrollingPerformanceLoggingEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> m_scrollingPerformanceLoggingEnabled = enabled;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/page/Settings.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -250,11 +250,6 @@
</span><span class="cx"> static bool lowPowerVideoAudioBufferSizeEnabled() { return gLowPowerVideoAudioBufferSizeEnabled; }
</span><span class="cx"> static void setLowPowerVideoAudioBufferSizeEnabled(bool);
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- static void setVideoPluginProxyEnabled(bool flag);
- static bool isVideoPluginProxyEnabled() { return gVideoPluginProxyEnabled; }
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static void setAudioSessionCategoryOverride(unsigned);
</span><span class="cx"> static unsigned audioSessionCategoryOverride();
</span><span class="lines">@@ -360,10 +355,6 @@
</span><span class="cx"> static double gHiddenPageDOMTimerAlignmentInterval;
</span><span class="cx">
</span><span class="cx"> static bool gLowPowerVideoAudioBufferSizeEnabled;
</span><del>-
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- static bool gVideoPluginProxyEnabled;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -99,10 +99,6 @@
</span><span class="cx"> virtual bool shouldAggressivelyRetainTiles(const GraphicsLayer*) const { return false; }
</span><span class="cx"> virtual bool shouldTemporarilyRetainTileCohorts(const GraphicsLayer*) const { return true; }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- virtual bool mediaLayerMustBeUpdatedOnMainThread() const { return false; }
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // RenderLayerBacking overrides this to verify that it is not
</span><span class="cx"> // currently painting contents. An ASSERT fails, if it is.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -144,12 +144,6 @@
</span><span class="cx"> virtual bool canLoadPoster() const { return false; }
</span><span class="cx"> virtual void setPoster(const String&) { }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- virtual void deliverNotification(MediaPlayerProxyNotificationType) { }
- virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) { }
- virtual void setControls(bool) { }
-#endif
-
</del><span class="cx"> virtual bool hasSingleSecurityOrigin() const { return true; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="lines">@@ -213,11 +207,6 @@
</span><span class="cx">
</span><span class="cx"> enginesQueried = true;
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (Settings::isVideoPluginProxyEnabled())
- MediaPlayerPrivateIOS::registerMediaEngine(addMediaEngine);
-#endif
-
</del><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> if (Settings::isAVFoundationEnabled()) {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -340,19 +329,7 @@
</span><span class="cx"> , m_privateBrowsing(false)
</span><span class="cx"> , m_shouldPrepareToRender(false)
</span><span class="cx"> , m_contentMIMETypeWasInferredFromExtension(false)
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- , m_playerProxy(0)
-#endif
</del><span class="cx"> {
</span><del>-#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
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayer::~MediaPlayer()
</span><span class="lines">@@ -446,9 +423,6 @@
</span><span class="cx"> m_private = engine->constructor(this);
</span><span class="cx"> if (m_mediaPlayerClient)
</span><span class="cx"> m_mediaPlayerClient->mediaPlayerEngineUpdated(this);
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- m_private->setMediaPlayerProxy(m_playerProxy);
-#endif
</del><span class="cx"> m_private->setPrivateBrowsingMode(m_privateBrowsing);
</span><span class="cx"> m_private->setPreload(m_preload);
</span><span class="cx"> m_private->setPreservesPitch(preservesPitch());
</span><span class="lines">@@ -857,25 +831,7 @@
</span><span class="cx"> return !installedMediaEngines().isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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)
</del><ins>+#if USE(NATIVE_FULLSCREEN_VIDEO)
</ins><span class="cx"> void MediaPlayer::enterFullscreen()
</span><span class="cx"> {
</span><span class="cx"> m_private->enterFullscreen();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -28,9 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> #include "GraphicsTypes3D.h"
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "MediaPlayerProxy.h"
-#endif
</del><span class="cx">
</span><span class="cx"> #include "AudioTrackPrivate.h"
</span><span class="cx"> #include "CDMSession.h"
</span><span class="lines">@@ -451,13 +448,7 @@
</span><span class="cx"> bool canLoadPoster() const;
</span><span class="cx"> void setPoster(const String&);
</span><span class="cx">
</span><del>-#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)
</del><ins>+#if USE(NATIVE_FULLSCREEN_VIDEO)
</ins><span class="cx"> void enterFullscreen();
</span><span class="cx"> void exitFullscreen();
</span><span class="cx"> #endif
</span><span class="lines">@@ -611,9 +602,6 @@
</span><span class="cx"> bool m_privateBrowsing;
</span><span class="cx"> bool m_shouldPrepareToRender;
</span><span class="cx"> bool m_contentMIMETypeWasInferredFromExtension;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- WebMediaPlayerProxy* m_playerProxy; // not owned or used, passed to m_private
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> RefPtr<MediaSourcePrivateClient> m_mediaSource;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -142,13 +142,7 @@
</span><span class="cx"> virtual bool canLoadPoster() const { return false; }
</span><span class="cx"> virtual void setPoster(const String&) { }
</span><span class="cx">
</span><del>-#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)
</del><ins>+#if USE(NATIVE_FULLSCREEN_VIDEO)
</ins><span class="cx"> virtual void enterFullscreen() { }
</span><span class="cx"> virtual void exitFullscreen() { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1553,20 +1553,9 @@
</span><span class="cx"> FloatPoint layerPosition(m_position.x() + m_anchorPoint.x() * m_size.width(), m_position.y() + m_anchorPoint.y() * m_size.height());
</span><span class="cx"> FloatRect layerBounds(m_boundsOrigin, m_size);
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> m_structuralLayer->setPosition(layerPosition);
</span><span class="cx"> m_structuralLayer->setBounds(layerBounds);
</span><span class="cx"> m_structuralLayer->setAnchorPoint(m_anchorPoint);
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- }
-#endif
</del><span class="cx">
</span><span class="cx"> if (LayerMap* layerCloneMap = m_structuralLayerClones.get()) {
</span><span class="cx"> LayerMap::const_iterator end = layerCloneMap->end();
</span><span class="lines">@@ -1591,20 +1580,9 @@
</span><span class="cx"> adjustedPosition = FloatPoint(scaledAnchorPoint.x() * scaledSize.width() - pixelAlignmentOffset.width(), scaledAnchorPoint.y() * scaledSize.height() - pixelAlignmentOffset.height());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> m_layer->setPosition(adjustedPosition);
</span><span class="cx"> m_layer->setBounds(adjustedBounds);
</span><span class="cx"> m_layer->setAnchorPoint(scaledAnchorPoint);
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- }
-#endif
</del><span class="cx">
</span><span class="cx"> if (LayerMap* layerCloneMap = m_layerClones.get()) {
</span><span class="cx"> LayerMap::const_iterator end = layerCloneMap->end();
</span><span class="lines">@@ -2094,18 +2072,8 @@
</span><span class="cx"> if (gainedOrLostClippingLayer)
</span><span class="cx"> noteSublayersChanged(DontScheduleFlush);
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> m_contentsLayer->setPosition(contentOrigin);
</span><span class="cx"> m_contentsLayer->setBounds(contentBounds);
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- }
-#endif
</del><span class="cx">
</span><span class="cx"> if (m_contentsLayerClones) {
</span><span class="cx"> LayerMap::const_iterator end = m_contentsLayerClones->end();
</span><span class="lines">@@ -3223,16 +3191,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool GraphicsLayerCA::mediaLayerMustBeUpdatedOnMainThread() const
-{
- if (m_contentsLayerPurpose != ContentsLayerForMedia)
- return false;
-
- return m_client && m_client->mediaLayerMustBeUpdatedOnMainThread();
-}
-#endif
-
</del><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::findOrMakeClone(CloneID cloneID, PlatformCALayer *sourceLayer, LayerMap* clones, CloneLevel cloneLevel)
</span><span class="cx"> {
</span><span class="cx"> if (!sourceLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -275,10 +275,6 @@
</span><span class="cx"> void setupContentsLayer(PlatformCALayer*);
</span><span class="cx"> PlatformCALayer* contentsLayer() const { return m_contentsLayer.get(); }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- bool mediaLayerMustBeUpdatedOnMainThread() const;
-#endif
-
</del><span class="cx"> virtual void setReplicatedByLayer(GraphicsLayer*) override;
</span><span class="cx">
</span><span class="cx"> virtual void getDebugBorderInfo(Color&, float& width) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -58,10 +58,6 @@
</span><span class="cx"> #include "TextRun.h"
</span><span class="cx"> #include <wtf/StackStats.h>
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="lines">@@ -653,11 +649,6 @@
</span><span class="cx">
</span><span class="cx"> bool RenderEmbeddedObject::canHaveChildren() const
</span><span class="cx"> {
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if (frameOwnerElement().isMediaElement())
- return true;
-#endif
-
</del><span class="cx"> if (isSnapshottedPlugIn())
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -2605,11 +2605,4 @@
</span><span class="cx"> return backingMemory;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-bool RenderLayerBacking::mediaLayerMustBeUpdatedOnMainThread() const
-{
- return renderer().frame().page() && renderer().frame().page()->settings().isVideoPluginProxyEnabled();
-}
-#endif
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -191,10 +191,6 @@
</span><span class="cx"> virtual bool shouldAggressivelyRetainTiles(const GraphicsLayer*) const override;
</span><span class="cx"> virtual bool shouldTemporarilyRetainTileCohorts(const GraphicsLayer*) const override;
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- virtual bool mediaLayerMustBeUpdatedOnMainThread() const override;
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> virtual void verifyNotPainting();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -73,11 +73,6 @@
</span><span class="cx"> #include "RenderScrollbar.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLAudioElement.h"
-#include "HTMLMediaElement.h"
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #include "RenderTreeAsText.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -2356,19 +2351,6 @@
</span><span class="cx"> RenderVideo& video = toRenderVideo(renderer);
</span><span class="cx"> return (video.requiresImmediateCompositing() || video.shouldDisplayVideo()) && canAccelerateVideoRendering(video);
</span><span class="cx"> }
</span><del>-#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)
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(renderer);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -160,9 +160,6 @@
</span><span class="cx"> ENABLE_PAGE_VISIBILITY_API = ENABLE_PAGE_VISIBILITY_API;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
</span><del>-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);
</del><span class="cx"> ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
</span><span class="cx"> ENABLE_PROMISES = ENABLE_PROMISES;
</span><span class="cx"> ENABLE_PROXIMITY_EVENTS = ;
</span><span class="lines">@@ -241,4 +238,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginContainerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginContainerPrivate.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -32,28 +32,12 @@
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> @interface NSObject (WebPlugInContainerPrivate)
</span><span class="cx">
</span><span class="cx"> - (id)_webPluginContainerCheckIfAllowedToLoadRequest:(NSURLRequest *)Request inFrame:(NSString *)target resultObject:(id)obj selector:(SEL)selector;
</span><span class="cx">
</span><span class="cx"> - (void)_webPluginContainerCancelCheckIfAllowedToLoadRequest:(id)checkIdentifier;
</span><span class="cx">
</span><del>-#if ENABLE_PLUGIN_PROXY_FOR_VIDEO
-- (void)_webPluginContainerSetMediaPlayerProxy:(WebMediaPlayerProxy *)proxy forElement:(DOMElement *)element;
-
-- (void)_webPluginContainerPostMediaPlayerNotification:(int)notification forElement:(DOMElement *)element;
-#endif
-
</del><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> // Call when the plug-in shows/hides its full-screen UI.
</span><span class="cx"> - (void)webPlugInContainerWillShowFullScreenForView:(id)plugInView;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> NSMutableArray *_views;
</span><span class="cx"> BOOL _started;
</span><span class="cx"> NSMutableSet *_checksInProgress;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- NSMutableArray *_viewsNotInDocument;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</span><span class="lines">@@ -63,10 +60,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)addPlugin:(NSView *)view;
</span><span class="cx"> - (void)destroyPlugin:(NSView *)view;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (void)mediaPlugInProxyViewCreated:(NSView *)view;
-+ (void)pluginViewHidden:(NSView *)view;
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> + (void)addPlugInView:(NSView *)view;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -118,26 +118,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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)
-
</del><span class="cx"> @implementation WebPluginController
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</span><span class="lines">@@ -234,9 +214,6 @@
</span><span class="cx"> {
</span><span class="cx"> [_views release];
</span><span class="cx"> [_checksInProgress release];
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- [_viewsNotInDocument release];
-#endif
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -244,9 +221,6 @@
</span><span class="cx"> - (BOOL)plugInsAreRunning
</span><span class="cx"> {
</span><span class="cx"> NSUInteger pluginViewCount = [_views count];
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- pluginViewCount += [_viewsNotInDocument count];
-#endif
</del><span class="cx"> return _started && pluginViewCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -334,12 +308,6 @@
</span><span class="cx"> for (int i = 0; i < viewsCount; i++)
</span><span class="cx"> [self stopOnePlugin:[_views objectAtIndex:i]];
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- int viewsNotInDocumentCount = [_viewsNotInDocument count];
- for (int i = 0; i < viewsNotInDocumentCount; i++)
- [self stopOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
-#endif
-
</del><span class="cx"> _started = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -356,12 +324,6 @@
</span><span class="cx"> for (NSUInteger i = 0; i < viewsCount; ++i)
</span><span class="cx"> [self stopOnePluginForPageCache:[_views objectAtIndex:i]];
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- NSUInteger viewsNotInDocumentCount = [_viewsNotInDocument count];
- for (NSUInteger i = 0; i < viewsNotInDocumentCount; ++i)
- [self stopOnePluginForPageCache:[_viewsNotInDocument objectAtIndex:i]];
-#endif
-
</del><span class="cx"> _started = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -375,31 +337,9 @@
</span><span class="cx">
</span><span class="cx"> for (NSUInteger i = 0; i < viewsCount; ++i)
</span><span class="cx"> [[webView _UIKitDelegateForwarder] webView:webView willAddPlugInView:[_views objectAtIndex:i]];
</span><del>-
-#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
</del><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> - (void)addPlugin:(NSView *)view
</span><span class="cx"> {
</span><span class="cx"> if (!_documentView) {
</span><span class="lines">@@ -413,11 +353,6 @@
</span><span class="cx"> [[_documentView _webView] addPluginInstanceView:view];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- if ([_viewsNotInDocument containsObject:view])
- [_viewsNotInDocument removeObject:view];
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> BOOL oldDefersCallbacks = [[self webView] defersCallbacks];
</span><span class="cx"> if (!oldDefersCallbacks)
</span><span class="lines">@@ -461,20 +396,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)destroyPlugin:(NSView *)view
</span><span class="cx"> {
</span><del>-#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
-
</del><span class="cx"> if ([_views containsObject:view]) {
</span><span class="cx"> if (_started)
</span><span class="cx"> [self stopOnePlugin:view];
</span><span class="cx"> [self destroyOnePlugin:view];
</span><del>-
</del><ins>+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (Frame* frame = core([self webFrame]))
</span><span class="cx"> frame->script().cleanupScriptObjectsForPlugin(self);
</span><span class="lines">@@ -534,12 +460,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- int viewsNotInDocumentCount = [_viewsNotInDocument count];
- for (int i = 0; i < viewsNotInDocumentCount; i++)
- [self destroyOnePlugin:[_viewsNotInDocument objectAtIndex:i]];
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [_views makeObjectsPerformSelector:@selector(removeFromSuperviewWithoutNeedingDisplay)];
</span><span class="cx"> #else
</span><span class="lines">@@ -701,50 +621,6 @@
</span><span class="cx"> [pluginView webPlugInMainResourceDidFinishLoading];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -208,13 +208,6 @@
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL,
</span><span class="cx"> const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;
</span><span class="cx"> virtual WTF::String overrideMediaType() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -130,10 +130,6 @@
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#import <WebCore/HTMLMediaElement.h>
-#endif
-
</del><span class="cx"> #if USE(PLUGIN_HOST_PROCESS) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> #import "NetscapePluginHostManager.h"
</span><span class="cx"> #import "WebHostedNetscapePluginView.h"
</span><span class="lines">@@ -1736,16 +1732,7 @@
</span><span class="cx"> #else
</span><span class="cx"> view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
</span><span class="cx"> [attributes release];
</span><del>-
- 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];
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return view;
</span><span class="cx"> }
</span><span class="lines">@@ -1952,10 +1939,11 @@
</span><span class="cx"> NSString *extension = [[pluginURL path] pathExtension];
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (!pluginPackage && [extension length]) {
</del><ins>+ if (!pluginPackage && [extension length])
</ins><span class="cx"> #else
</span><del>- if (!pluginPackage && [extension length] && ![MIMEType length]) {
</del><ins>+ if (!pluginPackage && [extension length] && ![MIMEType length])
</ins><span class="cx"> #endif
</span><ins>+ {
</ins><span class="cx"> pluginPackage = [webView _pluginForExtension:extension];
</span><span class="cx"> if (pluginPackage) {
</span><span class="cx"> NSString *newMIMEType = [pluginPackage MIMETypeForExtension:extension];
</span><span class="lines">@@ -1974,7 +1962,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ([pluginPackage isKindOfClass:[WebPluginPackage class]])
</span><span class="cx"> view = pluginView(m_webFrame.get(), (WebPluginPackage *)pluginPackage, attributeKeys, kit(paramValues), baseURL, kit(element), loadManually);
</span><del>-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><span class="cx"> WebBaseNetscapePluginView *pluginView = [[[NETSCAPE_PLUGIN_VIEW alloc]
</span><span class="lines">@@ -2105,10 +2092,9 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if ([pluginView isKindOfClass:[NETSCAPE_PLUGIN_VIEW class]])
</span><span class="cx"> [representation _redirectDataToManualLoader:(NETSCAPE_PLUGIN_VIEW *)pluginView forPluginView:pluginView];
</span><del>- else {
-#else
- {
</del><ins>+ else
</ins><span class="cx"> #endif
</span><ins>+ {
</ins><span class="cx"> WebHTMLView *documentView = (WebHTMLView *)[[m_webFrame.get() frameView] documentView];
</span><span class="cx"> ASSERT([documentView isKindOfClass:[WebHTMLView class]]);
</span><span class="cx"> [representation _redirectDataToManualLoader:[documentView _pluginController] forPluginView:pluginView];
</span><span class="lines">@@ -2138,7 +2124,7 @@
</span><span class="cx"> if (element->renderer()->isEmbeddedObject())
</span><span class="cx"> toRenderEmbeddedObject(element->renderer())->setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
</span><span class="cx"> } else {
</span><del>- #if ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
</span><span class="cx"> view = [[[NETSCAPE_PLUGIN_VIEW alloc] initWithFrame:NSMakeRect(0, 0, size.width(), size.height())
</span><span class="cx"> pluginPackage:(WebNetscapePluginPackage *)pluginPackage
</span><span class="lines">@@ -2152,7 +2138,7 @@
</span><span class="cx"> if (view)
</span><span class="cx"> return adoptRef(new NetscapePluginWidget(static_cast<WebBaseNetscapePluginView *>(view)));
</span><span class="cx"> }
</span><del>- #endif
</del><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2172,99 +2158,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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)
-
</del><span class="cx"> String WebFrameLoaderClient::overrideMediaType() const
</span><span class="cx"> {
</span><span class="cx"> NSString* overrideType = [getWebView(m_webFrame.get()) mediaStyle];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -118,7 +118,6 @@
</span><span class="cx"> #define WebKitAsynchronousSpellCheckingEnabledPreferenceKey @"WebKitAsynchronousSpellCheckingEnabled"
</span><span class="cx"> #define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
</span><span class="cx"> #define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
</span><del>-#define WebKitVideoPluginProxyEnabledKey @"WebKitVideoPluginProxyEnabled"
</del><span class="cx"> #define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
</span><span class="cx"> #define WebKitMediaPlaybackRequiresUserGesturePreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
</span><span class="cx"> #define WebKitMediaPlaybackAllowsInlinePreferenceKey @"WebKitMediaPlaybackAllowsInline"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -581,8 +581,6 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
</span><span class="cx">
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitUseLegacyTextAlignPositionedElementBehaviorPreferenceKey,
</span><del>-
- [NSNumber numberWithBool:NO], WebKitVideoPluginProxyEnabledKey,
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitMediaSourceEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><span class="lines">@@ -2132,12 +2130,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)setVideoPluginProxyEnabled:(BOOL)flag
</span><span class="cx"> {
</span><del>- [self _setBoolValue:flag forKey:WebKitVideoPluginProxyEnabledKey];
</del><ins>+ // No-op, left for SPI compatibility.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isVideoPluginProxyEnabled
</span><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitVideoPluginProxyEnabledKey];
</del><ins>+ return NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -363,8 +363,7 @@
</span><span class="cx"> - (void)setQTKitEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)isQTKitEnabled;
</span><span class="cx">
</span><del>-// VideoPluginProxy support is dependent on WebCore/WebKit being
-// compiled with ENABLE_PLUGIN_PROXY_FOR_VIDEO.
</del><ins>+// Deprecated, has no effect.
</ins><span class="cx"> - (void)setVideoPluginProxyEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)isVideoPluginProxyEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -2384,10 +2384,6 @@
</span><span class="cx">
</span><span class="cx"> settings.setUseLegacyTextAlignPositionedElementBehavior([preferences useLegacyTextAlignPositionedElementBehavior]);
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- settings.setVideoPluginProxyEnabled([preferences isVideoPluginProxyEnabled]);
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> settings.setMediaSourceEnabled([preferences mediaSourceEnabled]);
</span><span class="cx"> #endif
</span><span class="lines">@@ -4859,22 +4855,6 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> - (WebBasePluginPackage *)_pluginForExtension:(NSString *)extension
</span><span class="cx"> {
</span><span class="cx"> if (![_private->preferences arePlugInsEnabled])
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -190,9 +190,6 @@
</span><span class="cx"> - (void)_didChangeValueForKey:(NSString *)key;
</span><span class="cx"> - (WebBasePluginPackage *)_pluginForMIMEType:(NSString *)MIMEType;
</span><span class="cx"> - (WebBasePluginPackage *)_pluginForExtension:(NSString *)extension;
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-- (WebBasePluginPackage *)_videoProxyPluginForMIMEType:(NSString *)MIMEType;
-#endif
</del><span class="cx">
</span><span class="cx"> - (void)setCurrentNodeHighlight:(WebNodeHighlight *)nodeHighlight;
</span><span class="cx"> - (WebNodeHighlight *)currentNodeHighlight;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-04-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> If there are no services available, do not show the service controls UI
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -160,9 +160,6 @@
</span><span class="cx"> ENABLE_PAGE_VISIBILITY_API = ENABLE_PAGE_VISIBILITY_API;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN = $(ENABLE_PDFKIT_PLUGIN_$(PLATFORM_NAME));
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN_macosx = ENABLE_PDFKIT_PLUGIN;
</span><del>-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);
</del><span class="cx"> ENABLE_PROGRESS_ELEMENT = ENABLE_PROGRESS_ELEMENT;
</span><span class="cx"> ENABLE_PROMISES = ENABLE_PROMISES;
</span><span class="cx"> ENABLE_PROXIMITY_EVENTS = ;
</span><span class="lines">@@ -241,4 +238,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -1404,24 +1404,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static bool pluginSupportsExtension(const PluginData& pluginData, const String& extension)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(extension.lower() == extension);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -193,12 +193,6 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) override;
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType, bool shouldPreferPlugInsForImages) override;
</span><span class="cx"> virtual String overrideMediaType() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (168078 => 168079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-01 02:15:17 UTC (rev 168078)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-01 02:19:33 UTC (rev 168079)
</span><span class="lines">@@ -2612,10 +2612,6 @@
</span><span class="cx"> settings.setQTKitEnabled(store.getBoolValueForKey(WebPreferencesKey::isQTKitEnabledKey()));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- settings.setVideoPluginProxyEnabled(false);
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> settings.setAVKitEnabled(true);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>