Title: [124659] trunk/Source/WebKit2
- Revision
- 124659
- Author
- ander...@apple.com
- Date
- 2012-08-03 15:03:20 -0700 (Fri, 03 Aug 2012)
Log Message
Nothing happens when clicking on the unavailable plug-in button for a blocked plug-in
https://bugs.webkit.org/show_bug.cgi?id=93161
Reviewed by John Sullivan.
Be more robust against values being added to the RenderEmbeddedObject::PluginUnavailabilityReason
enumeration, and use a switch statement instead of blindly casting the type value to a WKPluginUnavailabilityReason.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::unavailablePluginButtonClicked):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (124658 => 124659)
--- trunk/Source/WebKit2/ChangeLog 2012-08-03 22:00:07 UTC (rev 124658)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-03 22:03:20 UTC (rev 124659)
@@ -1,3 +1,16 @@
+2012-08-03 Anders Carlsson <ander...@apple.com>
+
+ Nothing happens when clicking on the unavailable plug-in button for a blocked plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=93161
+
+ Reviewed by John Sullivan.
+
+ Be more robust against values being added to the RenderEmbeddedObject::PluginUnavailabilityReason
+ enumeration, and use a switch statement instead of blindly casting the type value to a WKPluginUnavailabilityReason.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::unavailablePluginButtonClicked):
+
2012-08-03 Brady Eidson <beid...@apple.com>
Small part of "Out-of-process plug-ins should support asynchronous initialization."
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (124658 => 124659)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-08-03 22:00:07 UTC (rev 124658)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-08-03 22:03:20 UTC (rev 124659)
@@ -82,6 +82,7 @@
#include <WebCore/FloatRect.h>
#include <WebCore/FocusDirection.h>
#include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/RenderEmbeddedObject.h>
#include <WebCore/TextCheckerClient.h>
#include <WebCore/WindowFeatures.h>
#include <stdio.h>
@@ -2471,7 +2472,22 @@
MESSAGE_CHECK_URL(url);
MESSAGE_CHECK_URL(pluginsPageURL);
- WKPluginUnavailabilityReason pluginUnavailabilityReason = static_cast<WKPluginUnavailabilityReason>(opaquePluginUnavailabilityReason);
+ WKPluginUnavailabilityReason pluginUnavailabilityReason = kWKPluginUnavailabilityReasonPluginMissing;
+ switch (static_cast<RenderEmbeddedObject::PluginUnavailabilityReason>(opaquePluginUnavailabilityReason)) {
+ case RenderEmbeddedObject::PluginMissing:
+ pluginUnavailabilityReason = kWKPluginUnavailabilityReasonPluginMissing;
+ break;
+ case RenderEmbeddedObject::InsecurePluginVersion:
+ pluginUnavailabilityReason = kWKPluginUnavailabilityReasonInsecurePluginVersion;
+ break;
+ case RenderEmbeddedObject::PluginCrashed:
+ pluginUnavailabilityReason = kWKPluginUnavailabilityReasonPluginCrashed;
+ break;
+
+ case RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy:
+ ASSERT_NOT_REACHED();
+ }
+
m_uiClient.unavailablePluginButtonClicked(this, pluginUnavailabilityReason, mimeType, url, pluginsPageURL);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
