Title: [144684] branches/safari-536.29-branch/Source/WebKit2
- Revision
- 144684
- Author
- [email protected]
- Date
- 2013-03-04 15:19:27 -0800 (Mon, 04 Mar 2013)
Log Message
Merge 144114
2013-02-26 Anders Carlsson <[email protected]>
Fix a copy/paste error in WebLoaderClient::didBlockInsecurePluginVersion
https://bugs.webkit.org/show_bug.cgi?id=110914
<rdar://problem/13297581>
Reviewed by Beth Dakin.
Pass kWKErrorCodeInsecurePlugInVersion to the pluginDidFail callback.
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::didBlockInsecurePluginVersion):
Modified Paths
Diff
Modified: branches/safari-536.29-branch/Source/WebKit2/ChangeLog (144683 => 144684)
--- branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 23:12:03 UTC (rev 144683)
+++ branches/safari-536.29-branch/Source/WebKit2/ChangeLog 2013-03-04 23:19:27 UTC (rev 144684)
@@ -1,5 +1,23 @@
2013-03-04 Brady Eidson <[email protected]>
+ Merge 144114
+
+ 2013-02-26 Anders Carlsson <[email protected]>
+
+ Fix a copy/paste error in WebLoaderClient::didBlockInsecurePluginVersion
+ https://bugs.webkit.org/show_bug.cgi?id=110914
+ <rdar://problem/13297581>
+
+ Reviewed by Beth Dakin.
+
+ Pass kWKErrorCodeInsecurePlugInVersion to the pluginDidFail callback.
+
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::WebLoaderClient::didBlockInsecurePluginVersion):
+
+
+2013-03-04 Brady Eidson <[email protected]>
+
Merge 144659
2013-03-04 Anders Carlsson <[email protected]>
Modified: branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp (144683 => 144684)
--- branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-03-04 23:12:03 UTC (rev 144683)
+++ branches/safari-536.29-branch/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-03-04 23:19:27 UTC (rev 144684)
@@ -284,7 +284,7 @@
if (m_client.pluginDidFail) {
RefPtr<ImmutableDictionary> pluginInformation = WebPageProxy::pluginInformationDictionary(pluginBundleIdentifier, pluginBundleVersion, String(), frameURLString, mimeType, pageURLString, String(), String());
- m_client.pluginDidFail(toAPI(page), kWKErrorCodeCannotLoadPlugIn, toAPI(pluginInformation.get()), m_client.clientInfo);
+ m_client.pluginDidFail(toAPI(page), kWKErrorCodeInsecurePlugInVersion, toAPI(pluginInformation.get()), m_client.clientInfo);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
