Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212537 => 212538)
--- 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)
@@ -1,5 +1,34 @@
2017-02-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <daba...@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_han...@apple.com>
+
Merge r212350. rdar://problem/30450379
2017-02-14 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/html/PluginDocument.cpp (212537 => 212538)
--- 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)
@@ -131,7 +131,7 @@
if (RenderWidget* renderer = m_embedElement->renderWidget()) {
if (Widget* widget = renderer->widget()) {
- frame->loader().client().redirectDataToPlugin(widget);
+ frame->loader().client().redirectDataToPlugin(*widget);
// In a plugin document, the main resource is the plugin. If we have a null widget, that means
// the loading of the plugin was cancelled, which gives us a null mainResourceLoader(), so we
// need to have this call in a null check of the widget or of mainResourceLoader().
@@ -169,7 +169,6 @@
{
// Release the plugin Element so that we don't have a circular reference.
m_pluginElement = nullptr;
- frame()->loader().client().redirectDataToPlugin(nullptr);
}
void PluginDocument::cancelManualPluginLoad()
Modified: branches/safari-603-branch/Source/WebCore/loader/EmptyClients.h (212537 => 212538)
--- 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)
@@ -394,7 +394,7 @@
ObjectContentType objectContentType(const URL&, const String&) override { return ObjectContentType::None; }
String overrideMediaType() const override { return String(); }
- void redirectDataToPlugin(Widget*) override { }
+ void redirectDataToPlugin(Widget&) override { }
void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) override { }
void registerForIconNotification(bool) override { }
Modified: branches/safari-603-branch/Source/WebCore/loader/FrameLoaderClient.h (212537 => 212538)
--- 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)
@@ -281,7 +281,7 @@
virtual RefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement*, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
virtual RefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
virtual void recreatePlugin(Widget*) = 0;
- virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
+ virtual void redirectDataToPlugin(Widget&) = 0;
virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (212537 => 212538)
--- 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)
@@ -1,5 +1,27 @@
2017-02-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <daba...@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_han...@apple.com>
+
Merge r212173. rdar://problem/29904368
2017-02-10 Daniel Bates <daba...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)
--- 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)
@@ -208,7 +208,7 @@
RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<WTF::String>&,
const Vector<WTF::String>&, const WTF::String&, bool) override;
void recreatePlugin(WebCore::Widget*) override;
- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
+ void redirectDataToPlugin(WebCore::Widget&) override;
#if ENABLE(WEBGL)
WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (212537 => 212538)
--- 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)
@@ -2058,16 +2058,13 @@
{
}
-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
{
- if (!pluginWidget)
- return;
-
BEGIN_BLOCK_OBJC_EXCEPTIONS;
WebHTMLRepresentation *representation = (WebHTMLRepresentation *)[[m_webFrame.get() _dataSource] representation];
- NSView *pluginView = pluginWidget->platformWidget();
+ NSView *pluginView = pluginWidget.platformWidget();
#if ENABLE(NETSCAPE_PLUGIN_API)
if ([pluginView isKindOfClass:[NETSCAPE_PLUGIN_VIEW class]])
Modified: branches/safari-603-branch/Source/WebKit/mac/WebKit.order (212537 => 212538)
--- 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)
@@ -2119,7 +2119,6 @@
__WKPHStreamDidFail
__ZN3JSC8jsStringEPNS_2VMERKN3WTF6StringE
__ZN3JSC8JSString6createERNS_2VMEN3WTF10PassRefPtrINS3_10StringImplEEE
-__ZN20WebFrameLoaderClient20redirectDataToPluginEPN7WebCore6WidgetE
-[WebHTMLRepresentation _redirectDataToManualLoader:forPluginView:]
-[WebHostedNetscapePluginView pluginView:receivedResponse:]
__ZN6WebKit26HostedNetscapePluginStreamC1EPNS_27NetscapePluginInstanceProxyEPN7WebCore11FrameLoaderE
Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (212537 => 212538)
--- 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)
@@ -1,5 +1,24 @@
2017-02-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <daba...@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_han...@apple.com>
+
Merge r212175. rdar://problem/29904368
2017-02-10 Daniel Bates <daba...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (212537 => 212538)
--- 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)
@@ -1178,13 +1178,13 @@
return nullptr;
}
-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
{
// Ideally, this function shouldn't be necessary, see <rdar://problem/4852889>
- if (!pluginWidget || pluginWidget->isPluginView())
- m_manualLoader = toPluginView(pluginWidget);
+ if (pluginWidget.isPluginView())
+ m_manualLoader = toPluginView(&pluginWidget);
else
- m_manualLoader = static_cast<EmbeddedWidget*>(pluginWidget);
+ m_manualLoader = static_cast<EmbeddedWidget*>(&pluginWidget);
}
PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const URL& /*baseURL*/, const Vector<String>& paramNames, const Vector<String>& paramValues)
Modified: branches/safari-603-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)
--- 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)
@@ -182,7 +182,7 @@
const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) override;
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;
void recreatePlugin(WebCore::Widget*) override { }
- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
+ void redirectDataToPlugin(WebCore::Widget&) override;
PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212537 => 212538)
--- 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)
@@ -1,5 +1,27 @@
2017-02-16 Matthew Hanson <matthew_han...@apple.com>
+ Merge r212518. rdar://problem/30541748
+
+ 2017-02-16 Daniel Bates <daba...@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_han...@apple.com>
+
Merge r212459. rdar://problem/29322051
2017-02-16 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (212537 => 212538)
--- 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)
@@ -1479,10 +1479,9 @@
#endif
}
-void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
+void WebFrameLoaderClient::redirectDataToPlugin(Widget& pluginWidget)
{
- if (pluginWidget)
- m_pluginView = static_cast<PluginView*>(pluginWidget);
+ m_pluginView = static_cast<PluginView*>(&pluginWidget);
}
#if ENABLE(WEBGL)
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (212537 => 212538)
--- 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)
@@ -203,7 +203,7 @@
RefPtr<WebCore::Widget> createPlugin(const WebCore::IntSize&, WebCore::HTMLPlugInElement*, const WebCore::URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) override;
void recreatePlugin(WebCore::Widget*) override;
- void redirectDataToPlugin(WebCore::Widget* pluginWidget) override;
+ void redirectDataToPlugin(WebCore::Widget&) override;
#if ENABLE(WEBGL)
WebCore::WebGLLoadPolicy webGLPolicyForURL(const String&) const override;
Modified: branches/safari-603-branch/Source/WebKit2/mac/WebKit2.order (212537 => 212538)
--- 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)
@@ -6990,7 +6990,6 @@
__ZN6WebKit15SimplePDFPlugin23windowVisibilityChangedEb
__ZN6WebKit15SimplePDFPlugin18windowFocusChangedEb
__ZN6WebKit15SimplePDFPlugin16wantsWheelEventsEv
-__ZN6WebKit20WebFrameLoaderClient20redirectDataToPluginEPN7WebCore6WidgetE
__ZN6WebKit10PluginView28manualLoadDidReceiveResponseERKN7WebCore16ResourceResponseE
__ZN6WebKit15SimplePDFPlugin30manualStreamDidReceiveResponseERKN7WebCore4KURLEjjRKN3WTF6StringES8_S8_
__ZN6WebKit10PluginView24manualLoadDidReceiveDataEPKci
