[webkit-changes] [117516] trunk/Source/WebKit2

Thu, 17 May 2012 17:11:59 -0700

Title: [117516] trunk/Source/WebKit2
Revision
117516
Author
[email protected]
Date
2012-05-17 17:12:48 -0700 (Thu, 17 May 2012)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (117515 => 117516)


--- trunk/Source/WebKit2/ChangeLog	2012-05-17 23:35:41 UTC (rev 117515)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-18 00:12:48 UTC (rev 117516)
@@ -1,3 +1,22 @@
+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-17  Oliver Hunt  <[email protected]>
 
         Endeavour to make the windows test bot actually able to run tests.

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (117515 => 117516)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-05-17 23:35:41 UTC (rev 117515)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-05-18 00:12:48 UTC (rev 117516)
@@ -3623,20 +3623,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: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (117515 => 117516)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-05-17 23:35:41 UTC (rev 117515)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-05-18 00:12:48 UTC (rev 117516)
@@ -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: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (117515 => 117516)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-05-17 23:35:41 UTC (rev 117515)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-05-18 00:12:48 UTC (rev 117516)
@@ -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: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (117515 => 117516)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-05-17 23:35:41 UTC (rev 117515)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-05-18 00:12:48 UTC (rev 117516)
@@ -401,7 +401,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

Reply via email to