<!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>[212538] branches/safari-603-branch/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/212538">212538</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 23:49:47 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212518">r212518</a>. rdar://problem/30541748</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlPluginDocumentcpp">branches/safari-603-branch/Source/WebCore/html/PluginDocument.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreloaderEmptyClientsh">branches/safari-603-branch/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreloaderFrameLoaderClienth">branches/safari-603-branch/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebKitorder">branches/safari-603-branch/Source/WebKit/mac/WebKit.order</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinChangeLog">branches/safari-603-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2macWebKit2order">branches/safari-603-branch/Source/WebKit2/mac/WebKit2.order</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <dabates@apple.com>
+
+ Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
+ https://bugs.webkit.org/show_bug.cgi?id=168417
+ <rdar://problem/30541748>
+
+ Reviewed by Brent Fulgham.
+
+ Remove Chromium-specific code that was added in r125500 to call FrameLoaderClient::redirectDataToPlugin(nullptr)
+ in PluginDocument::detachFromPluginElement(). Calling redirectDataToPlugin() with nullptr was used by the
+ Chromium port to signify that the plugin document was being destroyed so that they could tear down their
+ plugin widget. And PluginDocument::detachFromPluginElement() is the only place that calls redirectDataToPlugin()
+ passing nullptr. No other port made use of this machinery and the Chromium port has long since been removed
+ from the Open Source WebKit Project. We should remove this code.
+
+ * html/PluginDocument.cpp:
+ (WebCore::PluginDocumentParser::appendBytes): Pass the plugin widget by reference.
+ (WebCore::PluginDocument::detachFromPluginElement): Remove call to FrameLoaderClient::redirectDataToPlugin().
+ This call was only used by the Chromium port as means to be notified when the plugin document was being
+ destroyed. No other port made use of this notification or needed such a notification.
+ * loader/EmptyClients.cpp: Change argument of redirectDataToPlugin() from Widget* to Widget& to convey
+ that this function always takes a valid Widget. Also remove unnecessary argument name as the data type
+ of the argument and the name of the function sufficiently describes the purpose of the argument.
+ * loader/FrameLoaderClient.h: Ditto.
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212350. rdar://problem/30450379
</span><span class="cx">
</span><span class="cx"> 2017-02-14 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlPluginDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/PluginDocument.cpp (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/PluginDocument.cpp 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebCore/html/PluginDocument.cpp 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> if (RenderWidget* renderer = m_embedElement->renderWidget()) {
</span><span class="cx"> if (Widget* widget = renderer->widget()) {
</span><del>- frame->loader().client().redirectDataToPlugin(widget);
</del><ins>+ frame->loader().client().redirectDataToPlugin(*widget);
</ins><span class="cx"> // In a plugin document, the main resource is the plugin. If we have a null widget, that means
</span><span class="cx"> // the loading of the plugin was cancelled, which gives us a null mainResourceLoader(), so we
</span><span class="cx"> // need to have this call in a null check of the widget or of mainResourceLoader().
</span><span class="lines">@@ -169,7 +169,6 @@
</span><span class="cx"> {
</span><span class="cx"> // Release the plugin Element so that we don't have a circular reference.
</span><span class="cx"> m_pluginElement = nullptr;
</span><del>- frame()->loader().client().redirectDataToPlugin(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginDocument::cancelManualPluginLoad()
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/loader/EmptyClients.h (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/loader/EmptyClients.h 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebCore/loader/EmptyClients.h 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> ObjectContentType objectContentType(const URL&, const String&) override { return ObjectContentType::None; }
</span><span class="cx"> String overrideMediaType() const override { return String(); }
</span><span class="cx">
</span><del>- void redirectDataToPlugin(Widget*) override { }
</del><ins>+ void redirectDataToPlugin(Widget&) override { }
</ins><span class="cx"> void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) override { }
</span><span class="cx">
</span><span class="cx"> void registerForIconNotification(bool) override { }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/loader/FrameLoaderClient.h (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/loader/FrameLoaderClient.h 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebCore/loader/FrameLoaderClient.h 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement*, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
</span><span class="cx"> virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
</span><span class="cx"> virtual void recreatePlugin(Widget*) = 0;
</span><del>- virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
</del><ins>+ virtual void redirectDataToPlugin(Widget&) = 0;
</ins><span class="cx">
</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></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <dabates@apple.com>
+
+ Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
+ https://bugs.webkit.org/show_bug.cgi?id=168417
+ <rdar://problem/30541748>
+
+ Reviewed by Brent Fulgham.
+
+ Update override of FrameLoaderClient::redirectDataToPlugin() to take a Widget& instead of a
+ Widget* as it is always called with a valid Widget.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::redirectDataToPlugin):
+ * WebKit.order: Remove symbol for WebFrameLoaderClient::redirectDataToPlugin() that took a Widget*
+ as it no longer exists. I am unclear if this file is still meaningful as it was last modified in
+ r180570 (2 years ago) though Xcode still references this ordering file (why?).
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212173. rdar://problem/29904368
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<WTF::String>&,
</span><span class="cx"> const Vector<WTF::String>&, const WTF::String&, bool) override;
</span><span class="cx"> void recreatePlugin(WebCore::Widget*) override;
</span><del>- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
</del><ins>+ void redirectDataToPlugin(WebCore::Widget&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -2058,16 +2058,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
</del><ins>+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
</ins><span class="cx"> {
</span><del>- if (!pluginWidget)
- return;
-
</del><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> WebHTMLRepresentation *representation = (WebHTMLRepresentation *)[[m_webFrame.get() _dataSource] representation];
</span><span class="cx">
</span><del>- NSView *pluginView = pluginWidget->platformWidget();
</del><ins>+ NSView *pluginView = pluginWidget.platformWidget();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if ([pluginView isKindOfClass:[NETSCAPE_PLUGIN_VIEW class]])
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebKitorder"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebKit.order (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebKit.order 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/mac/WebKit.order 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -2119,7 +2119,6 @@
</span><span class="cx"> __WKPHStreamDidFail
</span><span class="cx"> __ZN3JSC8jsStringEPNS_2VMERKN3WTF6StringE
</span><span class="cx"> __ZN3JSC8JSString6createERNS_2VMEN3WTF10PassRefPtrINS3_10StringImplEEE
</span><del>-__ZN20WebFrameLoaderClient20redirectDataToPluginEPN7WebCore6WidgetE
</del><span class="cx"> -[WebHTMLRepresentation _redirectDataToManualLoader:forPluginView:]
</span><span class="cx"> -[WebHostedNetscapePluginView pluginView:receivedResponse:]
</span><span class="cx"> __ZN6WebKit26HostedNetscapePluginStreamC1EPNS_27NetscapePluginInstanceProxyEPN7WebCore11FrameLoaderE
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <dabates@apple.com>
+
+ Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
+ https://bugs.webkit.org/show_bug.cgi?id=168417
+ <rdar://problem/30541748>
+
+ Reviewed by Brent Fulgham.
+
+ Update override of FrameLoaderClient::redirectDataToPlugin() to take a Widget& instead of a
+ Widget* as it is always called with a valid Widget.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::redirectDataToPlugin):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212175. rdar://problem/29904368
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1178,13 +1178,13 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
</del><ins>+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
</ins><span class="cx"> {
</span><span class="cx"> // Ideally, this function shouldn't be necessary, see <rdar://problem/4852889>
</span><del>- if (!pluginWidget || pluginWidget->isPluginView())
- m_manualLoader = toPluginView(pluginWidget);
</del><ins>+ if (pluginWidget.isPluginView())
+ m_manualLoader = toPluginView(&pluginWidget);
</ins><span class="cx"> else
</span><del>- m_manualLoader = static_cast<EmbeddedWidget*>(pluginWidget);
</del><ins>+ m_manualLoader = static_cast<EmbeddedWidget*>(&pluginWidget);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const URL& /*baseURL*/, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
</span><span class="cx"> RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<WTF::String>&, const Vector<WTF::String>&, const WTF::String&, bool loadManually) override;
</span><span class="cx"> void recreatePlugin(WebCore::Widget*) override { }
</span><del>- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
</del><ins>+ void redirectDataToPlugin(WebCore::Widget&) override;
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <dabates@apple.com>
+
+ Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
+ https://bugs.webkit.org/show_bug.cgi?id=168417
+ <rdar://problem/30541748>
+
+ Reviewed by Brent Fulgham.
+
+ Update override of FrameLoaderClient::redirectDataToPlugin() to take a Widget& instead of a
+ Widget* as it is always called with a valid Widget.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::redirectDataToPlugin):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * mac/WebKit2.order: Remove symbol for WebFrameLoaderClient::redirectDataToPlugin() that took a Widget*
+ as it no longer exists. I am unclear if this file is still meaningful as it was last modified in
+ r180570 (2 years ago) though Xcode still references this ordering file (why?).
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212459. rdar://problem/29322051
</span><span class="cx">
</span><span class="cx"> 2017-02-16 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -1479,10 +1479,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
</del><ins>+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
</ins><span class="cx"> {
</span><del>- if (pluginWidget)
- m_pluginView = static_cast<PluginView*>(pluginWidget);
</del><ins>+ m_pluginView = static_cast<PluginView*>(&pluginWidget);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) override;
</span><span class="cx"> void recreatePlugin(WebCore::Widget*) override;
</span><del>- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
</del><ins>+ void redirectDataToPlugin(WebCore::Widget&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2macWebKit2order"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/mac/WebKit2.order (212537 => 212538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/mac/WebKit2.order 2017-02-17 07:49:41 UTC (rev 212537)
+++ branches/safari-603-branch/Source/WebKit2/mac/WebKit2.order 2017-02-17 07:49:47 UTC (rev 212538)
</span><span class="lines">@@ -6990,7 +6990,6 @@
</span><span class="cx"> __ZN6WebKit15SimplePDFPlugin23windowVisibilityChangedEb
</span><span class="cx"> __ZN6WebKit15SimplePDFPlugin18windowFocusChangedEb
</span><span class="cx"> __ZN6WebKit15SimplePDFPlugin16wantsWheelEventsEv
</span><del>-__ZN6WebKit20WebFrameLoaderClient20redirectDataToPluginEPN7WebCore6WidgetE
</del><span class="cx"> __ZN6WebKit10PluginView28manualLoadDidReceiveResponseERKN7WebCore16ResourceResponseE
</span><span class="cx"> __ZN6WebKit15SimplePDFPlugin30manualStreamDidReceiveResponseERKN7WebCore4KURLEjjRKN3WTF6StringES8_S8_
</span><span class="cx"> __ZN6WebKit10PluginView24manualLoadDidReceiveDataEPKci
</span></span></pre>
</div>
</div>
</body>
</html>