Title: [191509] trunk/Source/WebKit2
Revision
191509
Author
[email protected]
Date
2015-10-23 13:50:34 -0700 (Fri, 23 Oct 2015)

Log Message

WKView being inside WKWebView leads to weird API issues
https://bugs.webkit.org/show_bug.cgi?id=150174

Reviewed by Anders Carlsson.

* UIProcess/API/mac/WKView.mm:
(-[WKView _superRemoveTrackingRect:]):
(-[WKView addTrackingRect:owner:userData:assumeInside:]):
(-[WKView _addTrackingRect:owner:userData:assumeInside:useTrackingNum:]):
(-[WKView _addTrackingRects:owner:userDataList:assumeInsideList:trackingNums:count:]):
(-[WKView removeTrackingRect:]):
(-[WKView _removeTrackingRects:count:]):
(-[WKView view:stringForToolTip:point:userData:]):
(-[WKView _toolTipChangedFrom:to:]):
(-[WKView _setAcceleratedCompositingModeRootLayer:]): Deleted.
(-[WKView _acceleratedCompositingModeRootLayer]): Deleted.
(takeWindowSnapshot): Deleted.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::addTrackingRect):
(WebKit::WebViewImpl::addTrackingRectWithTrackingNum):
(WebKit::WebViewImpl::addTrackingRectsWithTrackingNums):
(WebKit::WebViewImpl::removeTrackingRect):
(WebKit::WebViewImpl::removeTrackingRects):
(WebKit::WebViewImpl::sendToolTipMouseExited):
(WebKit::WebViewImpl::sendToolTipMouseEntered):
(WebKit::WebViewImpl::stringForToolTip):
(WebKit::WebViewImpl::toolTipChanged):
Move tooltip code.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (191508 => 191509)


--- trunk/Source/WebKit2/ChangeLog	2015-10-23 20:49:38 UTC (rev 191508)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-23 20:50:34 UTC (rev 191509)
@@ -6,6 +6,38 @@
         Reviewed by Anders Carlsson.
 
         * UIProcess/API/mac/WKView.mm:
+        (-[WKView _superRemoveTrackingRect:]):
+        (-[WKView addTrackingRect:owner:userData:assumeInside:]):
+        (-[WKView _addTrackingRect:owner:userData:assumeInside:useTrackingNum:]):
+        (-[WKView _addTrackingRects:owner:userDataList:assumeInsideList:trackingNums:count:]):
+        (-[WKView removeTrackingRect:]):
+        (-[WKView _removeTrackingRects:count:]):
+        (-[WKView view:stringForToolTip:point:userData:]):
+        (-[WKView _toolTipChangedFrom:to:]):
+        (-[WKView _setAcceleratedCompositingModeRootLayer:]): Deleted.
+        (-[WKView _acceleratedCompositingModeRootLayer]): Deleted.
+        (takeWindowSnapshot): Deleted.
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::addTrackingRect):
+        (WebKit::WebViewImpl::addTrackingRectWithTrackingNum):
+        (WebKit::WebViewImpl::addTrackingRectsWithTrackingNums):
+        (WebKit::WebViewImpl::removeTrackingRect):
+        (WebKit::WebViewImpl::removeTrackingRects):
+        (WebKit::WebViewImpl::sendToolTipMouseExited):
+        (WebKit::WebViewImpl::sendToolTipMouseEntered):
+        (WebKit::WebViewImpl::stringForToolTip):
+        (WebKit::WebViewImpl::toolTipChanged):
+        Move tooltip code.
+
+2015-10-23  Tim Horton  <[email protected]>
+
+        WKView being inside WKWebView leads to weird API issues
+        https://bugs.webkit.org/show_bug.cgi?id=150174
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
         (-[WKView _interpretKeyEvent:completionHandler:]):
         (-[WKView inputContext]):
         (-[WKView performKeyEquivalent:]):

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (191508 => 191509)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-10-23 20:49:38 UTC (rev 191508)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-10-23 20:50:34 UTC (rev 191509)
@@ -179,11 +179,6 @@
 
     RetainPtr<NSTrackingArea> _primaryTrackingArea;
 
-    // For ToolTips.
-    NSToolTipTag _lastToolTipTag;
-    id _trackingRectOwner;
-    void* _trackingRectUserData;
-
     RetainPtr<NSView> _layerHostingView;
 
     RetainPtr<id> _remoteAccessibilityChild;
@@ -2110,6 +2105,11 @@
     [super quickLookWithEvent:event];
 }
 
+- (void)_superRemoveTrackingRect:(NSTrackingRectTag)tag
+{
+    [super removeTrackingRect:tag];
+}
+
 - (NSArray *)validAttributesForMarkedText
 {
     static NSArray *validAttributes;
@@ -2508,121 +2508,47 @@
     return toUserSpace(rect, [self window]);
 }
 
-// Any non-zero value will do, but using something recognizable might help us debug some day.
-#define TRACKING_RECT_TAG 0xBADFACE
-
 - (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside
 {
-    ASSERT(_data->_trackingRectOwner == nil);
-    _data->_trackingRectOwner = owner;
-    _data->_trackingRectUserData = data;
-    return TRACKING_RECT_TAG;
+    return _data->_impl->addTrackingRect(NSRectToCGRect(rect), owner, data, assumeInside);
 }
 
 - (NSTrackingRectTag)_addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside useTrackingNum:(int)tag
 {
-    ASSERT(tag == 0 || tag == TRACKING_RECT_TAG);
-    ASSERT(_data->_trackingRectOwner == nil);
-    _data->_trackingRectOwner = owner;
-    _data->_trackingRectUserData = data;
-    return TRACKING_RECT_TAG;
+    return _data->_impl->addTrackingRectWithTrackingNum(NSRectToCGRect(rect), owner, data, assumeInside, tag);
 }
 
 - (void)_addTrackingRects:(NSRect *)rects owner:(id)owner userDataList:(void **)userDataList assumeInsideList:(BOOL *)assumeInsideList trackingNums:(NSTrackingRectTag *)trackingNums count:(int)count
 {
-    ASSERT(count == 1);
-    ASSERT(trackingNums[0] == 0 || trackingNums[0] == TRACKING_RECT_TAG);
-    ASSERT(_data->_trackingRectOwner == nil);
-    _data->_trackingRectOwner = owner;
-    _data->_trackingRectUserData = userDataList[0];
-    trackingNums[0] = TRACKING_RECT_TAG;
+    CGRect *cgRects = (CGRect *)calloc(1, sizeof(CGRect));
+    for (int i = 0; i < count; i++)
+        cgRects[i] = NSRectToCGRect(rects[i]);
+    _data->_impl->addTrackingRectsWithTrackingNums(cgRects, owner, userDataList, assumeInsideList, trackingNums, count);
+    free(cgRects);
 }
 
 - (void)removeTrackingRect:(NSTrackingRectTag)tag
 {
     if (!_data)
         return;
-
-    if (tag == 0)
-        return;
-    
-    if (tag == TRACKING_RECT_TAG) {
-        _data->_trackingRectOwner = nil;
-        return;
-    }
-    
-    if (tag == _data->_lastToolTipTag) {
-        [super removeTrackingRect:tag];
-        _data->_lastToolTipTag = 0;
-        return;
-    }
-
-    // If any other tracking rect is being removed, we don't know how it was created
-    // and it's possible there's a leak involved (see 3500217)
-    ASSERT_NOT_REACHED();
+    _data->_impl->removeTrackingRect(tag);
 }
 
 - (void)_removeTrackingRects:(NSTrackingRectTag *)tags count:(int)count
 {
-    int i;
-    for (i = 0; i < count; ++i) {
-        int tag = tags[i];
-        if (tag == 0)
-            continue;
-        ASSERT(tag == TRACKING_RECT_TAG);
-        if (_data != nil) {
-            _data->_trackingRectOwner = nil;
-        }
-    }
+    if (!_data)
+        return;
+    _data->_impl->removeTrackingRects(tags, count);
 }
 
-- (void)_sendToolTipMouseExited
-{
-    // Nothing matters except window, trackingNumber, and userData.
-    NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
-        location:NSMakePoint(0, 0)
-        modifierFlags:0
-        timestamp:0
-        windowNumber:[[self window] windowNumber]
-        context:NULL
-        eventNumber:0
-        trackingNumber:TRACKING_RECT_TAG
-        userData:_data->_trackingRectUserData];
-    [_data->_trackingRectOwner mouseExited:fakeEvent];
-}
-
-- (void)_sendToolTipMouseEntered
-{
-    // Nothing matters except window, trackingNumber, and userData.
-    NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
-        location:NSMakePoint(0, 0)
-        modifierFlags:0
-        timestamp:0
-        windowNumber:[[self window] windowNumber]
-        context:NULL
-        eventNumber:0
-        trackingNumber:TRACKING_RECT_TAG
-        userData:_data->_trackingRectUserData];
-    [_data->_trackingRectOwner mouseEntered:fakeEvent];
-}
-
 - (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data
 {
-    return nsStringFromWebCoreString(_data->_page->toolTip());
+    return _data->_impl->stringForToolTip(tag);
 }
 
 - (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip
 {
-    if (oldToolTip)
-        [self _sendToolTipMouseExited];
-
-    if (newToolTip && [newToolTip length] > 0) {
-        // See radar 3500217 for why we remove all tooltips rather than just the single one we created.
-        [self removeAllToolTips];
-        NSRect wideOpenRect = NSMakeRect(-100000, -100000, 200000, 200000);
-        _data->_lastToolTipTag = [self addToolTipRect:wideOpenRect owner:self userData:NULL];
-        [self _sendToolTipMouseEntered];
-    }
+    _data->_impl->toolTipChanged(oldToolTip, newToolTip);
 }
 
 - (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (191508 => 191509)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h	2015-10-23 20:49:38 UTC (rev 191508)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h	2015-10-23 20:50:34 UTC (rev 191509)
@@ -50,6 +50,7 @@
 
 - (NSTextInputContext *)_superInputContext;
 - (void)_superQuickLookWithEvent:(NSEvent *)event;
+- (void)_superRemoveTrackingRect:(NSTrackingRectTag)tag;
 
 // This is a hack; these things live can live on a category (e.g. WKView (Private)) but WKView itself conforms to this protocol.
 // They're not actually optional.
@@ -218,6 +219,14 @@
 
     void accessibilityRegisterUIProcessTokens();
 
+    NSTrackingRectTag addTrackingRect(CGRect, id owner, void* userData, bool assumeInside);
+    NSTrackingRectTag addTrackingRectWithTrackingNum(CGRect, id owner, void* userData, bool assumeInside, int tag);
+    void addTrackingRectsWithTrackingNums(CGRect*, id owner, void** userDataList, bool assumeInside, NSTrackingRectTag *trackingNums, int count);
+    void removeTrackingRect(NSTrackingRectTag);
+    void removeTrackingRects(NSTrackingRectTag *, int count);
+    NSString *stringForToolTip(NSToolTipTag tag);
+    void toolTipChanged(NSString *oldToolTip, NSString *newToolTip);
+
 private:
     WeakPtr<WebViewImpl> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
 
@@ -229,6 +238,9 @@
 
     void setPluginComplexTextInputState(PluginComplexTextInputState);
 
+    void sendToolTipMouseExited();
+    void sendToolTipMouseEntered();
+
     NSView <WebViewImplDelegate> *m_view;
     WebPageProxy& m_page;
     PageClient& m_pageClient;
@@ -296,6 +308,10 @@
 
     bool m_allowsLinkPreview { true };
     bool m_didRegisterForLookupPopoverCloseNotifications { false };
+
+    NSToolTipTag m_lastToolTipTag { 0 };
+    id m_trackingRectOwner { nil };
+    void* m_trackingRectUserData { nullptr };
 };
     
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (191508 => 191509)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2015-10-23 20:49:38 UTC (rev 191508)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm	2015-10-23 20:50:34 UTC (rev 191509)
@@ -34,6 +34,7 @@
 #import "NativeWebKeyboardEvent.h"
 #import "NativeWebMouseEvent.h"
 #import "PageClient.h"
+#import "StringUtilities.h"
 #import "WKFullScreenWindowController.h"
 #import "WKImmediateActionController.h"
 #import "WKTextInputWindowController.h"
@@ -1441,6 +1442,117 @@
     m_page.registerUIProcessAccessibilityTokens(elementToken, windowToken);
 }
 
+// Any non-zero value will do, but using something recognizable might help us debug some day.
+#define TRACKING_RECT_TAG 0xBADFACE
+
+NSTrackingRectTag WebViewImpl::addTrackingRect(CGRect, id owner, void* userData, bool assumeInside)
+{
+    ASSERT(m_trackingRectOwner == nil);
+    m_trackingRectOwner = owner;
+    m_trackingRectUserData = userData;
+    return TRACKING_RECT_TAG;
+}
+
+NSTrackingRectTag WebViewImpl::addTrackingRectWithTrackingNum(CGRect, id owner, void* userData, bool assumeInside, int tag)
+{
+    ASSERT(tag == 0 || tag == TRACKING_RECT_TAG);
+    ASSERT(m_trackingRectOwner == nil);
+    m_trackingRectOwner = owner;
+    m_trackingRectUserData = userData;
+    return TRACKING_RECT_TAG;
+}
+
+void WebViewImpl::addTrackingRectsWithTrackingNums(CGRect*, id owner, void** userDataList, bool assumeInside, NSTrackingRectTag *trackingNums, int count)
+{
+    ASSERT(count == 1);
+    ASSERT(trackingNums[0] == 0 || trackingNums[0] == TRACKING_RECT_TAG);
+    ASSERT(m_trackingRectOwner == nil);
+    m_trackingRectOwner = owner;
+    m_trackingRectUserData = userDataList[0];
+    trackingNums[0] = TRACKING_RECT_TAG;
+}
+
+void WebViewImpl::removeTrackingRect(NSTrackingRectTag tag)
+{
+    if (tag == 0)
+        return;
+
+    if (tag == TRACKING_RECT_TAG) {
+        m_trackingRectOwner = nil;
+        return;
+    }
+
+    if (tag == m_lastToolTipTag) {
+        [m_view _superRemoveTrackingRect:tag];
+        m_lastToolTipTag = 0;
+        return;
+    }
+
+    // If any other tracking rect is being removed, we don't know how it was created
+    // and it's possible there's a leak involved (see 3500217)
+    ASSERT_NOT_REACHED();
+}
+
+void WebViewImpl::removeTrackingRects(NSTrackingRectTag *tags, int count)
+{
+    for (int i = 0; i < count; ++i) {
+        int tag = tags[i];
+        if (tag == 0)
+            continue;
+        ASSERT(tag == TRACKING_RECT_TAG);
+        m_trackingRectOwner = nil;
+    }
+}
+
+void WebViewImpl::sendToolTipMouseExited()
+{
+    // Nothing matters except window, trackingNumber, and userData.
+    NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
+                                                location:NSMakePoint(0, 0)
+                                           modifierFlags:0
+                                               timestamp:0
+                                            windowNumber:m_view.window.windowNumber
+                                                 context:NULL
+                                             eventNumber:0
+                                          trackingNumber:TRACKING_RECT_TAG
+                                                userData:m_trackingRectUserData];
+    [m_trackingRectOwner mouseExited:fakeEvent];
+}
+
+void WebViewImpl::sendToolTipMouseEntered()
+{
+    // Nothing matters except window, trackingNumber, and userData.
+    NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
+                                                location:NSMakePoint(0, 0)
+                                           modifierFlags:0
+                                               timestamp:0
+                                            windowNumber:m_view.window.windowNumber
+                                                 context:NULL
+                                             eventNumber:0
+                                          trackingNumber:TRACKING_RECT_TAG
+                                                userData:m_trackingRectUserData];
+    [m_trackingRectOwner mouseEntered:fakeEvent];
+}
+
+NSString *WebViewImpl::stringForToolTip(NSToolTipTag tag)
+{
+    return nsStringFromWebCoreString(m_page.toolTip());
+}
+
+void WebViewImpl::toolTipChanged(NSString *oldToolTip, NSString *newToolTip)
+{
+    if (oldToolTip)
+        sendToolTipMouseExited();
+    
+    if (newToolTip && [newToolTip length] > 0) {
+        // See radar 3500217 for why we remove all tooltips rather than just the single one we created.
+        [m_view removeAllToolTips];
+        NSRect wideOpenRect = NSMakeRect(-100000, -100000, 200000, 200000);
+        m_lastToolTipTag = [m_view addToolTipRect:wideOpenRect owner:m_view userData:NULL];
+        sendToolTipMouseEntered();
+    }
+}
+
 } // namespace WebKit
 
 #endif // PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to