Changeset 195451 in webkit

Timestamp:

Jan 22, 2016 8:50:17 AM (8 years ago)

Author:

Brent Fulgham

Message:

[Mac] Tooltips do not honor some types of obscuring windows
​https://bugs.webkit.org/show_bug.cgi?id=153263
<rdar://problem/21423972>

Reviewed by Simon Fraser.

Source/WebKit/mac:

• WebView/WebHTMLView.mm:

(-[WebHTMLView _updateMouseoverWithEvent:]): When the WebView is not the key window, don't
display tooltips.

Source/WebKit2:

Recognize that the current WebView is obscured by comparing the current event's Window Number against
the Window Number of the current WebView. If they don't match, something is in the way.

• UIProcess/Cocoa/WebViewImpl.h:
• UIProcess/Cocoa/WebViewImpl.mm:

(WebKit::WebViewImpl::windowIsFrontWindowUnderMouse): Added.

• UIProcess/PageClient.h:

(WebKit::PageClient::windowIsFrontWindowUnderMouse):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::handleMouseEvent): Check if the current WebView is obscured. If it
is, clear the tooltip and return.

• UIProcess/mac/PageClientImpl.h:
• UIProcess/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::windowIsFrontWindowUnderMouse): Added.

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/WebViewImpl.h (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/WebViewImpl.mm (modified) (2 diffs)
• WebKit2/UIProcess/PageClient.h (modified) (3 diffs)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebKit2/UIProcess/mac/PageClientImpl.h (modified) (2 diffs)
• WebKit2/UIProcess/mac/PageClientImpl.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-01-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Mac] Tooltips do not honor some types of obscuring windows
+        https://bugs.webkit.org/show_bug.cgi?id=153263
+        <rdar://problem/21423972>
+
+        Reviewed by Simon Fraser.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _updateMouseoverWithEvent:]): When the WebView is not the key window, don't
+        display tooltips.
+
 2016-01-19  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2010, 2016 Apple Inc. All rights reserved.
  *           (C) 2006, 2007 Graham Dennis (graham.dennis@gmail.com)
  *
@@ -2137 +2137 @@
                 ) {
                 coreFrame->eventHandler().mouseMoved(event, [[self _webView] _pressureEvent]);
-            } else
+            } else {
+                [self removeAllToolTips];
                 coreFrame->eventHandler().passMouseMovedEventToScrollbars(event, [[self _webView] _pressureEvent]);
+            }
         }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-21  Brent Fulgham  <bfulgham@apple.com>
+
+        [Mac] Tooltips do not honor some types of obscuring windows
+        https://bugs.webkit.org/show_bug.cgi?id=153263
+        <rdar://problem/21423972>
+
+        Reviewed by Simon Fraser.
+
+        Recognize that the current WebView is obscured by comparing the current event's Window Number against
+        the Window Number of the current WebView. If they don't match, something is in the way.
+
+        * UIProcess/Cocoa/WebViewImpl.h:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::windowIsFrontWindowUnderMouse): Added.
+        * UIProcess/PageClient.h:
+        (WebKit::PageClient::windowIsFrontWindowUnderMouse):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::handleMouseEvent): Check if the current WebView is obscured. If it
+        is, clear the tooltip and return.
+        * UIProcess/mac/PageClientImpl.h:
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::windowIsFrontWindowUnderMouse): Added.
+
 2016-01-22  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h

@@ -479 +479 @@
     void webViewImplAdditionsWillDestroyView();
 
+    bool windowIsFrontWindowUnderMouse(NSEvent *);
+
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WebViewImplAdditions.h>

trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -3973 +3973 @@
 }
 
+bool WebViewImpl::windowIsFrontWindowUnderMouse(NSEvent *event)
+{
+    NSRect eventScreenPosition = [m_view.window convertRectToScreen:NSMakeRect(event.locationInWindow.x, event.locationInWindow.y, 0, 0)];
+    NSInteger eventWindowNumber = [NSWindow windowNumberAtPoint:eventScreenPosition.origin belowWindowWithWindowNumber:0];
+        
+    return m_view.window.windowNumber != eventWindowNumber;
+}
+
+    
 } // namespace WebKit
 

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60 +60 @@
 class DrawingAreaProxy;
 class NativeWebKeyboardEvent;
+class NativeWebMouseEvent;
 class RemoteLayerTreeTransaction;
 class ViewSnapshot;
@@ -358 +359 @@
 
     virtual void didRestoreScrollPosition() = 0;
+
+    virtual bool windowIsFrontWindowUnderMouse(const NativeWebMouseEvent&) { return false; }
 };
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, 2011, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011, 2015-2016 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ -1668 +1668 @@
         return;
 
+    if (m_pageClient.windowIsFrontWindowUnderMouse(event))
+        setToolTip(String());
+
     // NOTE: This does not start the responsiveness timer because mouse move should not indicate interaction.
     if (event.type() != WebEvent::MouseMove)

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -240 +240 @@
 
     virtual void didRestoreScrollPosition() override;
+    virtual bool windowIsFrontWindowUnderMouse(const NativeWebMouseEvent&) override;
 };
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35 +35 @@
 #import "NativeWebGestureEvent.h"
 #import "NativeWebKeyboardEvent.h"
+#import "NativeWebMouseEvent.h"
 #import "NativeWebWheelEvent.h"
 #import "NavigationState.h"
@@ -831 +832 @@
 }
 
+bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
+{
+    return m_impl->windowIsFrontWindowUnderMouse(event.nativeEvent());
+}
+
 } // namespace WebKit