Title: [183999] trunk/Source/WebKit2
- Revision
- 183999
- Author
- [email protected]
- Date
- 2015-05-08 11:20:59 -0700 (Fri, 08 May 2015)
Log Message
Fix performance tests after r183954
https://bugs.webkit.org/show_bug.cgi?id=144805
Reviewed by Alexey Proskuryakov.
Web* is traditionally a WK1 prefix, so use the WK2 prefix instead in WK2 so that
we don’t have two classes with the same name in the two projects.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _defaultAnimationController]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183998 => 183999)
--- trunk/Source/WebKit2/ChangeLog 2015-05-08 18:15:57 UTC (rev 183998)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-08 18:20:59 UTC (rev 183999)
@@ -1,3 +1,15 @@
+2015-05-08 Beth Dakin <[email protected]>
+
+ Fix performance tests after r183954
+ https://bugs.webkit.org/show_bug.cgi?id=144805
+
+ Reviewed by Alexey Proskuryakov.
+
+ Web* is traditionally a WK1 prefix, so use the WK2 prefix instead in WK2 so that
+ we don’t have two classes with the same name in the two projects.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _defaultAnimationController]):
+
2015-05-08 Carlos Garcia Campos <[email protected]>
[GTK] Expose allowFileAccessFromFileURLs setting to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (183998 => 183999)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-05-08 18:15:57 UTC (rev 183998)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-05-08 18:20:59 UTC (rev 183999)
@@ -53,11 +53,11 @@
@interface WKImmediateActionController () <QLPreviewMenuItemDelegate>
@end
-@interface WebAnimationController : NSObject <NSImmediateActionAnimationController> {
+@interface WKAnimationController : NSObject <NSImmediateActionAnimationController> {
}
@end
-@implementation WebAnimationController
+@implementation WKAnimationController
@end
@implementation WKImmediateActionController
@@ -264,7 +264,7 @@
- (id <NSImmediateActionAnimationController>)_defaultAnimationController
{
if (_contentPreventsDefault) {
- RetainPtr<WebAnimationController> dummyController = [[WebAnimationController alloc] init];
+ RetainPtr<WKAnimationController> dummyController = [[WKAnimationController alloc] init];
return dummyController.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
