Title: [144686] tags/Safari-537.31.13/Source/WebKit2
- Revision
- 144686
- Author
- [email protected]
- Date
- 2013-03-04 15:23:12 -0800 (Mon, 04 Mar 2013)
Log Message
Merge r144659. <rdar://problem/13326713>
Modified Paths
Diff
Modified: tags/Safari-537.31.13/Source/WebKit2/ChangeLog (144685 => 144686)
--- tags/Safari-537.31.13/Source/WebKit2/ChangeLog 2013-03-04 23:21:43 UTC (rev 144685)
+++ tags/Safari-537.31.13/Source/WebKit2/ChangeLog 2013-03-04 23:23:12 UTC (rev 144686)
@@ -1,3 +1,20 @@
+2013-03-04 Lucas Forschler <[email protected]>
+
+ Merge r144659.
+
+ 2013-03-04 Anders Carlsson <[email protected]>
+
+ Complete the plug-in URL string before sending it to the UI process
+ https://bugs.webkit.org/show_bug.cgi?id=111355
+ <rdar://problem/13326713>
+
+ Reviewed by Andreas Kling.
+
+ If the URL is not absolute, we won't be able to find it by path extension in the plug-in info store.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::unavailablePluginButtonClicked):
+
2013-03-01 Lucas Forschler <[email protected]>
Merge r144397
Modified: tags/Safari-537.31.13/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (144685 => 144686)
--- tags/Safari-537.31.13/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-03-04 23:21:43 UTC (rev 144685)
+++ tags/Safari-537.31.13/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-03-04 23:23:12 UTC (rev 144686)
@@ -503,8 +503,9 @@
ASSERT(pluginUnavailabilityReason == RenderEmbeddedObject::PluginMissing || pluginUnavailabilityReason == RenderEmbeddedObject::InsecurePluginVersion || pluginUnavailabilityReason == RenderEmbeddedObject::PluginInactive);
HTMLPlugInImageElement* pluginElement = static_cast<HTMLPlugInImageElement*>(element);
+ String pluginURLString = pluginElement->document()->completeURL(pluginElement->url()).string();
- m_page->send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginElement->url(), pluginElement->getAttribute(pluginspageAttr)));
+ m_page->send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginURLString, pluginElement->getAttribute(pluginspageAttr)));
}
void WebChromeClient::scrollbarsModeDidChange() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
