Modified: trunk/Source/WebKit2/ChangeLog (164340 => 164341)
--- trunk/Source/WebKit2/ChangeLog 2014-02-19 02:19:12 UTC (rev 164340)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-19 02:26:21 UTC (rev 164341)
@@ -1,3 +1,17 @@
+2014-02-18 Tim Horton <[email protected]>
+
+ More WK_API_ENABLED after r164337.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView dealloc]):
+ (-[WKView scrollWheel:]):
+ (-[WKView mouseMoved:]):
+ (-[WKView mouseDown:]):
+ (-[WKView mouseUp:]):
+ (-[WKView mouseDragged:]):
+ (-[WKView _setAcceleratedCompositingModeRootLayer:]):
+ * UIProcess/API/mac/WKViewInternal.h:
+
2014-02-18 Simon Fraser <[email protected]>
Remove UIWKRemoteView
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (164340 => 164341)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-19 02:19:12 UTC (rev 164340)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-19 02:26:21 UTC (rev 164341)
@@ -228,7 +228,9 @@
BOOL _allowsMagnification;
BOOL _allowsBackForwardNavigationGestures;
+#if WK_API_ENABLED
WKThumbnailView *_thumbnailView;
+#endif
}
@end
@@ -277,7 +279,9 @@
{
_data->_page->close();
+#if WK_API_ENABLED
ASSERT(!_data->_thumbnailView);
+#endif
ASSERT(!_data->_inSecureInputState);
[_data release];
@@ -1082,8 +1086,10 @@
#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; \
@@ -1118,8 +1124,10 @@
- (void)scrollWheel:(NSEvent *)event
{
+#if WK_API_ENABLED
if (_data->_thumbnailView)
return;
+#endif
if (_data->_allowsBackForwardNavigationGestures) {
[self _ensureGestureController];
@@ -1133,8 +1141,10 @@
- (void)mouseMoved:(NSEvent *)event
{
+#if WK_API_ENABLED
if (_data->_thumbnailView)
return;
+#endif
// When a view is first responder, it gets mouse moved events even when the mouse is outside its visible rect.
if (self == [[self window] firstResponder] && !NSPointInRect([self convertPoint:[event locationInWindow] fromView:nil], [self visibleRect]))
@@ -1145,8 +1155,10 @@
- (void)mouseDown:(NSEvent *)event
{
+#if WK_API_ENABLED
if (_data->_thumbnailView)
return;
+#endif
[self _setMouseDownEvent:event];
_data->_ignoringMouseDraggedEvents = NO;
@@ -1155,8 +1167,10 @@
- (void)mouseUp:(NSEvent *)event
{
+#if WK_API_ENABLED
if (_data->_thumbnailView)
return;
+#endif
[self _setMouseDownEvent:nil];
[self mouseUpInternal:event];
@@ -1164,8 +1178,10 @@
- (void)mouseDragged:(NSEvent *)event
{
+#if WK_API_ENABLED
if (_data->_thumbnailView)
return;
+#endif
if (_data->_ignoringMouseDraggedEvents)
return;
@@ -2507,10 +2523,12 @@
{
[rootLayer web_disableAllActions];
+#if WK_API_ENABLED
if (_data->_thumbnailView) {
_data->_thumbnailView.thumbnailLayer = rootLayer;
return;
}
+#endif
[CATransaction begin];
[CATransaction setDisableActions:YES];
@@ -2975,6 +2993,7 @@
[types release];
}
+#if WK_API_ENABLED
- (void)_setThumbnailView:(WKThumbnailView *)thumbnailView
{
ASSERT(!_data->_thumbnailView || !thumbnailView);
@@ -2995,6 +3014,7 @@
{
return _data->_thumbnailView;
}
+#endif // WK_API_ENABLED
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (164340 => 164341)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-02-19 02:19:12 UTC (rev 164340)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-02-19 02:26:21 UTC (rev 164341)
@@ -54,7 +54,9 @@
}
@class WKFullScreenWindowController;
+#if WK_API_ENABLED
@class WKThumbnailView;
+#endif
@interface WKView ()
#if WK_API_ENABLED
@@ -105,7 +107,9 @@
- (void)_setSuppressVisibilityUpdates:(BOOL)suppressVisibilityUpdates;
- (BOOL)_suppressVisibilityUpdates;
+#if WK_API_ENABLED
@property (nonatomic, setter=_setThumbnailView:) WKThumbnailView *_thumbnailView;
+#endif
// FullScreen
