<!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>[161469] trunk/Source/WebKit/mac</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/161469">161469</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-01-07 16:42:18 -0800 (Tue, 07 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream a bug fix for plugin-backed media elements
https://bugs.webkit.org/show_bug.cgi?id=126412
Reviewed by Eric Carlson.
Media elements backed by plug-ins should outlive being removed from the
document, like their native counterparts do.
* Plugins/WebPluginController.h:
* Plugins/WebPluginController.mm:
(-[NSView isMediaPlugInProxyView]):
(-[NSView setIsMediaPlugInProxyView:]):
(-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
(-[WebPluginController mediaPlugInProxyViewCreated:]):
(-[WebPluginController destroyPlugin:]):
* WebCoreSupport/WebFrameLoaderClient.mm:
(pluginView):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161468 => 161469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-08 00:42:15 UTC (rev 161468)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-08 00:42:18 UTC (rev 161469)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-02 Andy Estes <aestes@apple.com>
+
+ [iOS] Upstream a bug fix for plugin-backed media elements
+ https://bugs.webkit.org/show_bug.cgi?id=126412
+
+ Reviewed by Eric Carlson.
+
+ Media elements backed by plug-ins should outlive being removed from the
+ document, like their native counterparts do.
+
+ * Plugins/WebPluginController.h:
+ * Plugins/WebPluginController.mm:
+ (-[NSView isMediaPlugInProxyView]):
+ (-[NSView setIsMediaPlugInProxyView:]):
+ (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
+ (-[WebPluginController mediaPlugInProxyViewCreated:]):
+ (-[WebPluginController destroyPlugin:]):
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (pluginView):
+
</ins><span class="cx"> 2014-01-07 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/126562> DOMProgressEvent has unspecified availability
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.h (161468 => 161469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-01-08 00:42:15 UTC (rev 161468)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.h 2014-01-08 00:42:18 UTC (rev 161469)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
</del><ins>+- (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
</ins><span class="cx"> + (BOOL)isPlugInView:(NSView *)view;
</span><span class="cx">
</span><span class="cx"> - (id)initWithDocumentView:(NSView *)view;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> - (void)addPlugin:(NSView *)view;
</span><span class="cx"> - (void)destroyPlugin:(NSView *)view;
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><del>-- (void)pluginViewCreated:(NSView *)view;
</del><ins>+- (void)mediaPlugInProxyViewCreated:(NSView *)view;
</ins><span class="cx"> + (void)pluginViewHidden:(NSView *)view;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (161468 => 161469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-01-08 00:42:15 UTC (rev 161468)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2014-01-08 00:42:18 UTC (rev 161469)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "WebPluginController.h"
</span><span class="cx">
</span><span class="cx"> #import "DOMNodeInternal.h"
</span><ins>+#import "WebBasePluginPackage.h"
</ins><span class="cx"> #import "WebDataSourceInternal.h"
</span><span class="cx"> #import "WebFrameInternal.h"
</span><span class="cx"> #import "WebFrameView.h"
</span><span class="lines">@@ -117,17 +118,36 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#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)
+
</ins><span class="cx"> @implementation WebPluginController
</span><span class="cx">
</span><del>-+ (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
</del><ins>+- (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> initializeAudioSession();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [pluginPackage load];
</span><del>- Class viewFactory = [pluginPackage viewFactory];
-
</del><ins>+
</ins><span class="cx"> NSView *view = nil;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -137,6 +157,7 @@
</span><span class="cx"> view = [[webView _UIKitDelegateForwarder] webView:webView plugInViewWithArguments:arguments fromPlugInPackage:pluginPackage];
</span><span class="cx"> }
</span><span class="cx"> #else
</span><ins>+ Class viewFactory = [pluginPackage viewFactory];
</ins><span class="cx"> if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
</span><span class="cx"> JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
</span><span class="cx"> view = [viewFactory plugInViewWithArguments:arguments];
</span><span class="lines">@@ -145,7 +166,7 @@
</span><span class="cx"> view = [viewFactory pluginViewWithArguments:arguments];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
</ins><span class="cx"> if (view == nil) {
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="lines">@@ -154,7 +175,7 @@
</span><span class="cx"> pluginViews = [[NSMutableSet alloc] init];
</span><span class="cx"> }
</span><span class="cx"> [pluginViews addObject:view];
</span><del>-
</del><ins>+
</ins><span class="cx"> return view;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -347,8 +368,9 @@
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><del>-- (void)pluginViewCreated:(NSView *)view
</del><ins>+- (void)mediaPlugInProxyViewCreated:(NSView *)view
</ins><span class="cx"> {
</span><ins>+ view.isMediaPlugInProxyView = YES;
</ins><span class="cx"> if (!_viewsNotInDocument)
</span><span class="cx"> _viewsNotInDocument= [[NSMutableArray alloc] init];
</span><span class="cx"> if (![_viewsNotInDocument containsObject:view])
</span><span class="lines">@@ -423,10 +445,15 @@
</span><span class="cx"> - (void)destroyPlugin:(NSView *)view
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span><del>- if ([_views containsObject:view] || [_viewsNotInDocument containsObject:view]) {
-#else
</del><ins>+ // 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
+
</ins><span class="cx"> if ([_views containsObject:view]) {
</span><del>-#endif
</del><span class="cx"> if (_started)
</span><span class="cx"> [self stopOnePlugin:view];
</span><span class="cx"> [self destroyOnePlugin:view];
</span><span class="lines">@@ -441,9 +468,6 @@
</span><span class="cx"> [[_documentView _webView] removePluginInstanceView:view];
</span><span class="cx"> #endif
</span><span class="cx"> [_views removeObject:view];
</span><del>-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
- [_viewsNotInDocument removeObject:view];
-#endif
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (161468 => 161469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-01-08 00:42:15 UTC (rev 161468)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-01-08 00:42:18 UTC (rev 161469)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import "DOMElementInternal.h"
</span><span class="cx"> #import "DOMHTMLFormElementInternal.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span><ins>+#import "WebBasePluginPackage.h"
</ins><span class="cx"> #import "WebCachedFramePlatformData.h"
</span><span class="cx"> #import "WebChromeClient.h"
</span><span class="cx"> #import "WebDataSourceInternal.h"
</span><span class="lines">@@ -1837,8 +1838,17 @@
</span><span class="cx"> LOG(Plugins, "arguments:\n%@", arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
</del><ins>+ view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
</ins><span class="cx"> [attributes release];
</span><ins>+
+ if (!view)
+ return nil;
+
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+ Element* node = core(element);
+ if (node->hasTagName(HTMLNames::videoTag) || node->hasTagName(HTMLNames::audioTag))
+ [pluginController mediaPlugInProxyViewCreated:view];
+#endif
</ins><span class="cx"> return view;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>