Title: [164343] trunk/Source/WebKit2
- Revision
- 164343
- Author
- [email protected]
- Date
- 2014-02-18 18:34:38 -0800 (Tue, 18 Feb 2014)
Log Message
Can't use #if inside a macro, so we'll duplicate the macro for now.
Build fix for all of Mac.
* UIProcess/API/mac/WKView.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164342 => 164343)
--- trunk/Source/WebKit2/ChangeLog 2014-02-19 02:29:07 UTC (rev 164342)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-19 02:34:38 UTC (rev 164343)
@@ -1,5 +1,13 @@
2014-02-18 Tim Horton <[email protected]>
+ Can't use #if inside a macro, so we'll duplicate the macro for now.
+
+ Build fix for all of Mac.
+
+ * UIProcess/API/mac/WKView.mm:
+
+2014-02-18 Tim Horton <[email protected]>
+
Don't build WKThumbnailView on iOS; it won't build.
* Configurations/WebKit2.xcconfig:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (164342 => 164343)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-19 02:29:07 UTC (rev 164342)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-19 02:34:38 UTC (rev 164343)
@@ -1083,13 +1083,12 @@
_data->_mouseDownEvent = [event retain];
}
+#if WK_API_ENABLED
#define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
- (void)Selector:(NSEvent *)theEvent \
{ \
- #if WK_API_ENABLED \
if (_data->_thumbnailView) \
return; \
- #endif \
if ([[self inputContext] handleEvent:theEvent]) { \
LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
return; \
@@ -1097,6 +1096,18 @@
NativeWebMouseEvent webEvent(theEvent, self); \
_data->_page->handleMouseEvent(webEvent); \
}
+#else
+#define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
+ - (void)Selector:(NSEvent *)theEvent \
+ { \
+ if ([[self inputContext] handleEvent:theEvent]) { \
+ LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(theEvent, self); \
+ _data->_page->handleMouseEvent(webEvent); \
+ }
+#endif
NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
