Title: [120088] branches/safari-536-branch/Source/WebKit/mac
- Revision
- 120088
- Author
- [email protected]
- Date
- 2012-06-12 10:05:44 -0700 (Tue, 12 Jun 2012)
Log Message
Merged r119543 -> <rdar://problem/11602601>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit/mac/ChangeLog (120087 => 120088)
--- branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-06-12 17:04:07 UTC (rev 120087)
+++ branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-06-12 17:05:44 UTC (rev 120088)
@@ -1,5 +1,17 @@
2012-06-12 Lucas Forschler <[email protected]>
+ Merge 119543
+
+ 2012-06-05 Anders Carlsson <[email protected]>
+
+ Build fix.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::createPlugin):
+ The error constant has been renamed.
+
+2012-06-12 Lucas Forschler <[email protected]>
+
Merge 119542
2012-06-05 Anders Carlsson <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (120087 => 120088)
--- branches/safari-536-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-06-12 17:04:07 UTC (rev 120087)
+++ branches/safari-536-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2012-06-12 17:05:44 UTC (rev 120088)
@@ -1686,7 +1686,7 @@
}
#endif
} else {
- errorCode = WebKitErrorInsecurePlugInVersion;
+ errorCode = WebKitErrorBlockedPlugInVersion;
if (element->renderer()->isEmbeddedObject())
toRenderEmbeddedObject(element->renderer())->setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
