Title: [117857] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117856 => 117857)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:24:53 UTC (rev 117856)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-22 00:27:09 UTC (rev 117857)
@@ -1,5 +1,22 @@
2012-05-21 Lucas Forschler <[email protected]>
+ Merge 117634
+
+ 2012-05-18 Anders Carlsson <[email protected]>
+
+ Missing plugin msg becomes "insecure plugin version" after Real Player page refresh
+ https://bugs.webkit.org/show_bug.cgi?id=86903
+ <rdar://problem/11477163>
+
+ Reviewed by Andreas Kling.
+
+ Set blocked to false before returning early when the plug-in doesn't exist.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::getPluginPath):
+
+2012-05-21 Lucas Forschler <[email protected]>
+
Merge 117623
2012-05-18 Anders Carlsson <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp (117856 => 117857)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-05-22 00:24:53 UTC (rev 117856)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebContext.cpp 2012-05-22 00:27:09 UTC (rev 117857)
@@ -653,11 +653,11 @@
String newMimeType = mimeType.lower();
+ blocked = false;
PluginModuleInfo plugin = pluginInfoStore().findPlugin(newMimeType, KURL(KURL(), urlString));
if (!plugin.path)
return;
- blocked = false;
if (pluginInfoStore().shouldBlockPlugin(plugin)) {
blocked = true;
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
