[webkit-changes] [173380] trunk/Source/WebKit/mac

Mon, 08 Sep 2014 09:12:37 -0700

Title: [173380] trunk/Source/WebKit/mac
Revision
173380
Author
[email protected]
Date
2014-09-08 09:11:51 -0700 (Mon, 08 Sep 2014)

Log Message

32-bit build fix after r173364.

* Carbon/HIViewAdapter.m:
(+[HIViewAdapter bindHIViewToNSView:nsView:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/Carbon/HIViewAdapter.m (173379 => 173380)


--- trunk/Source/WebKit/mac/Carbon/HIViewAdapter.m	2014-09-08 15:28:09 UTC (rev 173379)
+++ trunk/Source/WebKit/mac/Carbon/HIViewAdapter.m	2014-09-08 16:11:51 UTC (rev 173380)
@@ -46,9 +46,9 @@
 
 static CFMutableDictionaryRef sViewMap;
 
-static IMP oldNSViewSetNeedsDisplayIMP;
-static IMP oldNSViewSetNeedsDisplayInRectIMP;
-static IMP oldNSViewNextValidKeyViewIMP;
+static void (*oldNSViewSetNeedsDisplayIMP)(id, SEL, BOOL);
+static void (*oldNSViewSetNeedsDisplayInRectIMP)(id, SEL, NSRect);
+static NSView *(*oldNSViewNextValidKeyViewIMP)(id, SEL);
 
 static void _webkit_NSView_setNeedsDisplay(id self, SEL _cmd, BOOL flag);
 static void _webkit_NSView_setNeedsDisplayInRect(id self, SEL _cmd, NSRect invalidRect);
@@ -63,19 +63,19 @@
         Method setNeedsDisplayMethod = class_getInstanceMethod(objc_getClass("NSView"), @selector(setNeedsDisplay:));
         ASSERT(setNeedsDisplayMethod);
         ASSERT(!oldNSViewSetNeedsDisplayIMP);
-        oldNSViewSetNeedsDisplayIMP = method_setImplementation(setNeedsDisplayMethod, (IMP)_webkit_NSView_setNeedsDisplay);
+        oldNSViewSetNeedsDisplayIMP = (void (*)(id, SEL, BOOL))(method_setImplementation(setNeedsDisplayMethod, (IMP)(_webkit_NSView_setNeedsDisplay)));
 
         // Override -[NSView setNeedsDisplayInRect:]
         Method setNeedsDisplayInRectMethod = class_getInstanceMethod(objc_getClass("NSView"), @selector(setNeedsDisplayInRect:));
         ASSERT(setNeedsDisplayInRectMethod);
         ASSERT(!oldNSViewSetNeedsDisplayInRectIMP);
-        oldNSViewSetNeedsDisplayInRectIMP = method_setImplementation(setNeedsDisplayInRectMethod, (IMP)_webkit_NSView_setNeedsDisplayInRect);
+        oldNSViewSetNeedsDisplayInRectIMP = (void (*)(id, SEL, NSRect))(method_setImplementation(setNeedsDisplayInRectMethod, (IMP)(_webkit_NSView_setNeedsDisplayInRect)));
 
         // Override -[NSView nextValidKeyView]
         Method nextValidKeyViewMethod = class_getInstanceMethod(objc_getClass("NSView"), @selector(nextValidKeyView));
         ASSERT(nextValidKeyViewMethod);
         ASSERT(!oldNSViewNextValidKeyViewIMP);
-        oldNSViewNextValidKeyViewIMP = method_setImplementation(nextValidKeyViewMethod, (IMP)_webkit_NSView_nextValidKeyView);
+        oldNSViewNextValidKeyViewIMP = (NSView *(*)(id, SEL))(method_setImplementation(nextValidKeyViewMethod, (IMP)(_webkit_NSView_nextValidKeyView)));
     }
 
     CFDictionaryAddValue(sViewMap, nsView, hiView);

Modified: trunk/Source/WebKit/mac/ChangeLog (173379 => 173380)


--- trunk/Source/WebKit/mac/ChangeLog	2014-09-08 15:28:09 UTC (rev 173379)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-09-08 16:11:51 UTC (rev 173380)
@@ -1,3 +1,10 @@
+2014-09-08  Jessie Berlin  <[email protected]>
+
+        32-bit build fix after r173364.
+
+        * Carbon/HIViewAdapter.m:
+        (+[HIViewAdapter bindHIViewToNSView:nsView:]):
+
 2014-09-08  Dan Bernstein  <[email protected]>
 
         Build fix.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to