Title: [117850] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117849 => 117850)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:11:51 UTC (rev 117849)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:14:58 UTC (rev 117850)
@@ -1,3 +1,26 @@
+2012-05-21 Lucas Forschler <[email protected]>
+
+ Merge 117516
+
+ 2012-05-17 Anders Carlsson <[email protected]>
+
+ Plug-ins blacklist mechanism can tell clients about plug-in with null identifier
+ https://bugs.webkit.org/show_bug.cgi?id=86788
+ <rdar://problem/11479503>
+
+ Reviewed by John Sullivan.
+
+ Pass along the URL string of the blocked plug-in so we can find the plug-in even if there was no
+ MIME type specified in the <embed> or <object> tag.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didBlockInsecurePluginVersion):
+ * UIProcess/WebPageProxy.h:
+ (WebPageProxy):
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::createPlugin):
+
2012-05-16 Lucas Forschler <[email protected]>
Merge 117129
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (117849 => 117850)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-22 00:11:51 UTC (rev 117849)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-05-22 00:14:58 UTC (rev 117850)
@@ -3621,20 +3621,20 @@
m_loaderClient.didFailToInitializePlugin(this, mimeType);
}
-void WebPageProxy::didBlockInsecurePluginVersion(const String& mimeType)
+void WebPageProxy::didBlockInsecurePluginVersion(const String& mimeType, const String& urlString)
{
String pluginIdentifier;
String pluginVersion;
#if PLATFORM(MAC)
String newMimeType = mimeType;
- PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, KURL());
+ PluginModuleInfo plugin = m_process->context()->pluginInfoStore().findPlugin(newMimeType, KURL(KURL(), urlString));
pluginIdentifier = plugin.bundleIdentifier;
pluginVersion = plugin.versionString;
#endif
- m_loaderClient.didBlockInsecurePluginVersion(this, mimeType, pluginIdentifier, pluginVersion);
+ m_loaderClient.didBlockInsecurePluginVersion(this, newMimeType, pluginIdentifier, pluginVersion);
}
bool WebPageProxy::willHandleHorizontalScrollEvents() const
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.h (117849 => 117850)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2012-05-22 00:11:51 UTC (rev 117849)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2012-05-22 00:14:58 UTC (rev 117850)
@@ -745,7 +745,7 @@
void didChangeScrollOffsetPinningForMainFrame(bool pinnedToLeftSide, bool pinnedToRightSide);
void didChangePageCount(unsigned);
void didFailToInitializePlugin(const String& mimeType);
- void didBlockInsecurePluginVersion(const String& mimeType);
+ void didBlockInsecurePluginVersion(const String& mimeType, const String& urlString);
void setCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents) { m_canShortCircuitHorizontalWheelEvents = canShortCircuitHorizontalWheelEvents; }
void reattachToWebProcess();
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (117849 => 117850)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-05-22 00:11:51 UTC (rev 117849)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2012-05-22 00:14:58 UTC (rev 117850)
@@ -66,7 +66,7 @@
DidChangeScrollOffsetPinningForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar)
DidChangePageCount(unsigned pageCount);
DidFailToInitializePlugin(WTF::String mimeType)
- DidBlockInsecurePluginVersion(WTF::String mimeType)
+ DidBlockInsecurePluginVersion(WTF::String mimeType, WTF::String urlString)
SetCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents)
#if USE(TILED_BACKING_STORE)
Modified: branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (117849 => 117850)
--- branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-22 00:11:51 UTC (rev 117849)
+++ branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-05-22 00:14:58 UTC (rev 117850)
@@ -398,7 +398,7 @@
if (pluginElement->renderer()->isEmbeddedObject())
toRenderEmbeddedObject(pluginElement->renderer())->setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
- send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType));
+ send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType, parameters.url.string()));
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
