2010-12-01 Simon Fraser <simon.fraser@apple.com>
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Dec 2010 00:14:49 +0000 (00:14 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 2 Dec 2010 00:14:49 +0000 (00:14 +0000)
        Reviewed by John Sullivan.

        Hit testing broken on sibling views of the WKView
        <rdar://problem/8718397>

        Make sure that hitView is not null when comparing with the
        _layerHostingView.

        * UIProcess/API/mac/WKView.mm:
        (-[WKView hitTest:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@73084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit2/ChangeLog
WebKit2/UIProcess/API/mac/WKView.mm

index b729f30..960ea9f 100644 (file)
@@ -1,3 +1,16 @@
+2010-12-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Hit testing broken on sibling views of the WKView
+        <rdar://problem/8718397>
+        
+        Make sure that hitView is not null when comparing with the
+        _layerHostingView.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView hitTest:]):
+
 2010-12-01  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam Weinig.
index d808056..f35997e 100644 (file)
@@ -709,7 +709,7 @@ static NSScreen *screenForWindow(NSWindow *window)
 {
     NSView *hitView = [super hitTest:point];
 #if USE(ACCELERATED_COMPOSITING)
-    if (_data && hitView == _data->_layerHostingView)
+    if (hitView && _data && hitView == _data->_layerHostingView)
         hitView = self;
 #endif
     return hitView;