[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 17:53:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 686c5d14b62aeb78e422f7f75ef250b220be80f3
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 00:14:49 2010 +0000
2010-12-01 Simon Fraser <simon.fraser at 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:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b729f30..960ea9f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-01 Simon Fraser <simon.fraser at 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 at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index d808056..f35997e 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list