Changeset 183999 in webkit

Timestamp:

May 8, 2015, 11:20:59 AM (11 years ago)

Author:

Beth Dakin

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]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKImmediateActionController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-08  Beth Dakin  <bdakin@apple.com>
+
+        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  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

@@ -54 +54 @@
 @end
 
-@interface WebAnimationController : NSObject <NSImmediateActionAnimationController> {
+@interface WKAnimationController : NSObject <NSImmediateActionAnimationController> {
 }
 @end
 
-@implementation WebAnimationController
+@implementation WKAnimationController
 @end
 
@@ -265 +265 @@
 {
     if (_contentPreventsDefault) {
-        RetainPtr<WebAnimationController> dummyController = [[WebAnimationController alloc] init];
+        RetainPtr<WKAnimationController> dummyController = [[WKAnimationController alloc] init];
         return dummyController.get();
     }