Title: [144678] branches/safari-536.29-branch/Source/WebKit2
- Revision
- 144678
- Author
- [email protected]
- Date
- 2013-03-04 14:29:43 -0800 (Mon, 04 Mar 2013)
Log Message
Merge 144659
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):
Modified Paths
Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144677 => 144678)
--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 22:28:11 UTC (rev 144677)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 22:29:43 UTC (rev 144678)
@@ -1,5 +1,22 @@
2013-03-04 Brady Eidson <[email protected]>
+ Merge 144659
+
+ 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-04 Brady Eidson <[email protected]>
+
<rdar://problem/13337144> - Update 536.29 branch Loader and UI client layouts
Reviewed by Anders Carlsson.
Modified: branches/safari-536.29-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (144677 => 144678)
--- branches/safari-536.29-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-03-04 22:28:11 UTC (rev 144677)
+++ branches/safari-536.29-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-03-04 22:29:43 UTC (rev 144678)
@@ -498,10 +498,11 @@
String frameURLString = pluginElement->document()->frame()->loader()->documentLoader()->responseURL().string();
String pageURLString = m_page->mainFrame()->loader()->documentLoader()->responseURL().string();
+ String pluginURLString = pluginElement->document()->completeURL(pluginElement->url()).string();
KURL pluginspageAttributeURL = element->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(pluginElement->getAttribute(pluginspageAttr)));
if (!pluginspageAttributeURL.protocolIsInHTTPFamily())
pluginspageAttributeURL = KURL();
- m_page->send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginElement->url(), pluginspageAttributeURL.string(), frameURLString, pageURLString));
+ m_page->send(Messages::WebPageProxy::UnavailablePluginButtonClicked(pluginUnavailabilityReason, pluginElement->serviceType(), pluginURLString, pluginspageAttributeURL.string(), frameURLString, pageURLString));
}
void WebChromeClient::scrollbarsModeDidChange() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
