Title: [120087] branches/safari-536-branch/Source/WebKit/mac
- Revision
- 120087
- Author
- [email protected]
- Date
- 2012-06-12 10:04:07 -0700 (Tue, 12 Jun 2012)
Log Message
Merged r119542 -> <rdar://problem/11602601>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit/mac/ChangeLog (120086 => 120087)
--- branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-06-12 16:57:12 UTC (rev 120086)
+++ branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-06-12 17:04:07 UTC (rev 120087)
@@ -1,3 +1,17 @@
+2012-06-12 Lucas Forschler <[email protected]>
+
+ Merge 119542
+
+ 2012-06-05 Anders Carlsson <[email protected]>
+
+ Rename a plug-in loading error constant
+ https://bugs.webkit.org/show_bug.cgi?id=88381
+ <rdar://problem/11602601>
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebKitErrors.h:
+
2012-06-06 Mark Rowe <[email protected]>
Merge r119339.
Modified: branches/safari-536-branch/Source/WebKit/mac/Misc/WebKitErrors.h (120086 => 120087)
--- branches/safari-536-branch/Source/WebKit/mac/Misc/WebKitErrors.h 2012-06-12 16:57:12 UTC (rev 120086)
+++ branches/safari-536-branch/Source/WebKit/mac/Misc/WebKitErrors.h 2012-06-12 17:04:07 UTC (rev 120087)
@@ -51,10 +51,11 @@
@constant WebKitErrorCannotFindPlugIn
@constant WebKitErrorCannotLoadPlugIn
@constant WebKitErrorJavaUnavailable
+ @constant WebKitErrorBlockedPlugInVersion
*/
enum {
WebKitErrorCannotFindPlugIn = 200,
WebKitErrorCannotLoadPlugIn = 201,
WebKitErrorJavaUnavailable = 202,
- WebKitErrorInsecurePlugInVersion = 203,
+ WebKitErrorBlockedPlugInVersion = 203,
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
