[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:49:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fbe5e0ba4a0188d5e539a56cf9a1bb01e1e07b59
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 00:59:03 2010 +0000

    2010-11-30  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Sam Weinig.
    
            Context menus broken after WebKit2 goes into accelerated composting mode.
            https://bugs.webkit.org/show_bug.cgi?id=50296
    
            Override hitTest: on the WKView to exclude the child layer-backed view from
            hit testing, so that context menus work.
    
            * UIProcess/API/mac/WKView.mm:
            (-[WKView hitTest:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72982 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index be8ca62..0f6b233 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-30  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Context menus broken after WebKit2 goes into accelerated composting mode.
+        https://bugs.webkit.org/show_bug.cgi?id=50296
+        
+        Override hitTest: on the WKView to exclude the child layer-backed view from
+        hit testing, so that context menus work.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView hitTest:]):
+
 2010-11-30  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index d706884..65d6ed9 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -706,6 +706,16 @@ static NSScreen *screenForWindow(NSWindow *window)
     [self _updateVisibility];
 }
 
+- (NSView *)hitTest:(NSPoint)point
+{
+    NSView *hitView = [super hitTest:point];
+#if USE(ACCELERATED_COMPOSITING)
+    if (_data && hitView == _data->_layerHostingView)
+        hitView = self;
+#endif
+    return hitView;
+}
+
 @end
 
 @implementation WKView (Internal)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list