- Revision
- 191510
- Author
- [email protected]
- Date
- 2015-10-23 14:03:08 -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 hitTest:]):
(-[WKView _processDidExit]):
(-[WKView _setThumbnailView:]):
(-[WKView _thumbnailView]):
(-[WKFlippedView isFlipped]): Deleted.
(-[WKView dealloc]): Deleted.
(-[WKView _setAcceleratedCompositingModeRootLayer:]): Deleted.
(-[WKView _acceleratedCompositingModeRootLayer]): Deleted.
(-[WKView _updateThumbnailViewLayer]): Deleted.
(-[WKView _reparentLayerTreeInThumbnailView]): Deleted.
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/Cocoa/WebViewImpl.h:
(WebKit::WebViewImpl::acceleratedCompositingRootLayer):
(WebKit::WebViewImpl::layerHostingView):
(WebKit::WebViewImpl::thumbnailView):
* UIProcess/Cocoa/WebViewImpl.mm:
(-[WKFlippedView isFlipped]):
(WebKit::WebViewImpl::~WebViewImpl):
(WebKit::WebViewImpl::setAcceleratedCompositingRootLayer):
(WebKit::WebViewImpl::setThumbnailView):
(WebKit::WebViewImpl::reparentLayerTreeInThumbnailView):
(WebKit::WebViewImpl::updateThumbnailViewLayer):
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::enterAcceleratedCompositingMode):
(WebKit::PageClientImpl::exitAcceleratedCompositingMode):
(WebKit::PageClientImpl::updateAcceleratedCompositingMode):
(WebKit::PageClientImpl::setAcceleratedCompositingRootLayer):
(WebKit::PageClientImpl::acceleratedCompositingRootLayer):
Move accelerated compositing and thumbnail view code.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191509 => 191510)
--- trunk/Source/WebKit2/ChangeLog 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-23 21:03:08 UTC (rev 191510)
@@ -6,6 +6,44 @@
Reviewed by Anders Carlsson.
* UIProcess/API/mac/WKView.mm:
+ (-[WKView hitTest:]):
+ (-[WKView _processDidExit]):
+ (-[WKView _setThumbnailView:]):
+ (-[WKView _thumbnailView]):
+ (-[WKFlippedView isFlipped]): Deleted.
+ (-[WKView dealloc]): Deleted.
+ (-[WKView _setAcceleratedCompositingModeRootLayer:]): Deleted.
+ (-[WKView _acceleratedCompositingModeRootLayer]): Deleted.
+ (-[WKView _updateThumbnailViewLayer]): Deleted.
+ (-[WKView _reparentLayerTreeInThumbnailView]): Deleted.
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ (WebKit::WebViewImpl::acceleratedCompositingRootLayer):
+ (WebKit::WebViewImpl::layerHostingView):
+ (WebKit::WebViewImpl::thumbnailView):
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (-[WKFlippedView isFlipped]):
+ (WebKit::WebViewImpl::~WebViewImpl):
+ (WebKit::WebViewImpl::setAcceleratedCompositingRootLayer):
+ (WebKit::WebViewImpl::setThumbnailView):
+ (WebKit::WebViewImpl::reparentLayerTreeInThumbnailView):
+ (WebKit::WebViewImpl::updateThumbnailViewLayer):
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::enterAcceleratedCompositingMode):
+ (WebKit::PageClientImpl::exitAcceleratedCompositingMode):
+ (WebKit::PageClientImpl::updateAcceleratedCompositingMode):
+ (WebKit::PageClientImpl::setAcceleratedCompositingRootLayer):
+ (WebKit::PageClientImpl::acceleratedCompositingRootLayer):
+ Move accelerated compositing and thumbnail view 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 _superRemoveTrackingRect:]):
(-[WKView addTrackingRect:owner:userData:assumeInside:]):
(-[WKView _addTrackingRect:owner:userData:assumeInside:useTrackingNum:]):
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (191509 => 191510)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-23 21:03:08 UTC (rev 191510)
@@ -80,7 +80,6 @@
#import "WebSystemInterface.h"
#import "WebViewImpl.h"
#import "_WKRemoteObjectRegistryInternal.h"
-#import "_WKThumbnailViewInternal.h"
#import <QuartzCore/QuartzCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ColorMac.h>
@@ -104,7 +103,6 @@
#import <WebCore/TextIndicator.h>
#import <WebCore/TextIndicatorWindow.h>
#import <WebCore/TextUndoInsertionMarkupMac.h>
-#import <WebCore/WebActionDisablingCALayerDelegate.h>
#import <WebCore/WebCoreCALayerExtras.h>
#import <WebCore/WebCoreFullScreenPlaceholderView.h>
#import <WebCore/WebCoreFullScreenWindow.h>
@@ -179,8 +177,6 @@
RetainPtr<NSTrackingArea> _primaryTrackingArea;
- RetainPtr<NSView> _layerHostingView;
-
RetainPtr<id> _remoteAccessibilityChild;
// For asynchronous validation.
@@ -213,13 +209,7 @@
BOOL _allowsMagnification;
BOOL _allowsBackForwardNavigationGestures;
- RetainPtr<CALayer> _rootLayer;
-
CGFloat _totalHeightOfBanners;
-
-#if WK_API_ENABLED
- _WKThumbnailView *_thumbnailView;
-#endif
}
@end
@@ -236,18 +226,6 @@
- (bool)didReceiveUnhandledCommand;
@end
-@interface WKFlippedView : NSView
-@end
-
-@implementation WKFlippedView
-
-- (BOOL)isFlipped
-{
- return YES;
-}
-
-@end
-
@interface WKView () <WebViewImplDelegate>
@end
@@ -280,10 +258,6 @@
_data->_impl = nullptr;
-#if WK_API_ENABLED
- ASSERT(!_data->_thumbnailView);
-#endif
-
[_data release];
_data = nil;
@@ -2410,7 +2384,7 @@
- (NSView *)hitTest:(NSPoint)point
{
NSView *hitView = [super hitTest:point];
- if (hitView && _data && hitView == _data->_layerHostingView)
+ if (hitView && _data && hitView == _data->_impl->layerHostingView())
hitView = self;
return hitView;
@@ -2443,8 +2417,8 @@
{
_data->_impl->notifyInputContextAboutDiscardedComposition();
- if (_data->_layerHostingView)
- [self _setAcceleratedCompositingModeRootLayer:nil];
+ if (_data->_impl->layerHostingView())
+ _data->_impl->setAcceleratedCompositingRootLayer(nil);
[self _updateRemoteAccessibilityRegistration:NO];
@@ -2551,61 +2525,6 @@
_data->_impl->toolTipChanged(oldToolTip, newToolTip);
}
-- (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer
-{
- [rootLayer web_disableAllActions];
-
- _data->_rootLayer = rootLayer;
-
-#if WK_API_ENABLED
- if (_data->_thumbnailView) {
- [self _updateThumbnailViewLayer];
- return;
- }
-#endif
-
- [CATransaction begin];
- [CATransaction setDisableActions:YES];
-
- if (rootLayer) {
- if (!_data->_layerHostingView) {
- // Create an NSView that will host our layer tree.
- _data->_layerHostingView = adoptNS([[WKFlippedView alloc] initWithFrame:[self bounds]]);
- [_data->_layerHostingView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-
-
- [self addSubview:_data->_layerHostingView.get() positioned:NSWindowBelow relativeTo:nil];
-
- // Create a root layer that will back the NSView.
- RetainPtr<CALayer> layer = adoptNS([[CALayer alloc] init]);
- [layer setDelegate:[WebActionDisablingCALayerDelegate shared]];
-#ifndef NDEBUG
- [layer setName:@"Hosting root layer"];
-#endif
-
- [_data->_layerHostingView setLayer:layer.get()];
- [_data->_layerHostingView setWantsLayer:YES];
- }
-
- [_data->_layerHostingView layer].sublayers = [NSArray arrayWithObject:rootLayer];
- } else {
- if (_data->_layerHostingView) {
- [_data->_layerHostingView removeFromSuperview];
- [_data->_layerHostingView setLayer:nil];
- [_data->_layerHostingView setWantsLayer:NO];
-
- _data->_layerHostingView = nullptr;
- }
- }
-
- [CATransaction commit];
-}
-
-- (CALayer *)_acceleratedCompositingModeRootLayer
-{
- return _data->_rootLayer.get();
-}
-
static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captureAtNominalResolution)
{
CGSWindowCaptureOptions options = kCGSCaptureIgnoreGlobalClipShape;
@@ -2969,34 +2888,15 @@
#if WK_API_ENABLED
- (void)_setThumbnailView:(_WKThumbnailView *)thumbnailView
{
- ASSERT(!_data->_thumbnailView || !thumbnailView);
-
- _data->_thumbnailView = thumbnailView;
-
- if (thumbnailView)
- [self _updateThumbnailViewLayer];
- else
- [self _setAcceleratedCompositingModeRootLayer:_data->_rootLayer.get()];
+ _data->_impl->setThumbnailView(thumbnailView);
}
- (_WKThumbnailView *)_thumbnailView
{
- return _data->_thumbnailView;
+ if (!_data->_impl)
+ return nil;
+ return _data->_impl->thumbnailView();
}
-
-- (void)_updateThumbnailViewLayer
-{
- _WKThumbnailView *thumbnailView = _data->_thumbnailView;
- ASSERT(thumbnailView);
-
- if (thumbnailView._waitingForSnapshot && self.window)
- [self _reparentLayerTreeInThumbnailView];
-}
-
-- (void)_reparentLayerTreeInThumbnailView
-{
- _data->_thumbnailView._thumbnailLayer = _data->_rootLayer.get();
-}
#endif // WK_API_ENABLED
- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (191509 => 191510)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-23 21:03:08 UTC (rev 191510)
@@ -87,9 +87,6 @@
- (NSRect)_convertToDeviceSpace:(NSRect)rect;
- (NSRect)_convertToUserSpace:(NSRect)rect;
-- (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer;
-- (CALayer *)_acceleratedCompositingModeRootLayer;
-
- (PassRefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot;
- (void)_wheelEventWasNotHandledByWebCore:(NSEvent *)event;
@@ -117,7 +114,6 @@
#if WK_API_ENABLED
@property (nonatomic, setter=_setThumbnailView:) _WKThumbnailView *_thumbnailView;
-- (void)_reparentLayerTreeInThumbnailView;
#endif
- (void)_addFontPanelObserver;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (191509 => 191510)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2015-10-23 21:03:08 UTC (rev 191510)
@@ -45,6 +45,7 @@
OBJC_CLASS WKImmediateActionController;
OBJC_CLASS WKViewLayoutStrategy;
OBJC_CLASS WKWindowVisibilityObserver;
+OBJC_CLASS _WKThumbnailView;
@protocol WebViewImplDelegate
@@ -227,6 +228,15 @@
NSString *stringForToolTip(NSToolTipTag tag);
void toolTipChanged(NSString *oldToolTip, NSString *newToolTip);
+ void setAcceleratedCompositingRootLayer(CALayer *);
+ CALayer *acceleratedCompositingRootLayer() const { return m_rootLayer.get(); }
+ NSView *layerHostingView() const { return m_layerHostingView.get(); }
+
+#if WK_API_ENABLED
+ void setThumbnailView(_WKThumbnailView *);
+ _WKThumbnailView *thumbnailView() const { return m_thumbnailView; }
+#endif // WK_API_ENABLED
+
private:
WeakPtr<WebViewImpl> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
@@ -241,6 +251,9 @@
void sendToolTipMouseExited();
void sendToolTipMouseEntered();
+ void reparentLayerTreeInThumbnailView();
+ void updateThumbnailViewLayer();
+
NSView <WebViewImplDelegate> *m_view;
WebPageProxy& m_page;
PageClient& m_pageClient;
@@ -312,6 +325,13 @@
NSToolTipTag m_lastToolTipTag { 0 };
id m_trackingRectOwner { nil };
void* m_trackingRectUserData { nullptr };
+
+ RetainPtr<CALayer> m_rootLayer;
+ RetainPtr<NSView> m_layerHostingView;
+
+#if WK_API_ENABLED
+ _WKThumbnailView *m_thumbnailView;
+#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (191509 => 191510)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2015-10-23 21:03:08 UTC (rev 191510)
@@ -42,6 +42,7 @@
#import "WKWebView.h"
#import "WebEditCommandProxy.h"
#import "WebPageProxy.h"
+#import "_WKThumbnailViewInternal.h"
#import <HIToolbox/CarbonEventsCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/DataDetectorsSPI.h>
@@ -52,6 +53,8 @@
#import <WebCore/NSWindowSPI.h>
#import <WebCore/SoftLinking.h>
#import <WebCore/ViewState.h>
+#import <WebCore/WebActionDisablingCALayerDelegate.h>
+#import <WebCore/WebCoreCALayerExtras.h>
#import <WebCore/WebCoreFullScreenPlaceholderView.h>
#import <WebCore/WebCoreFullScreenWindow.h>
#import <WebKitSystemInterface.h>
@@ -296,6 +299,18 @@
@end
+@interface WKFlippedView : NSView
+@end
+
+@implementation WKFlippedView
+
+- (BOOL)isFlipped
+{
+ return YES;
+}
+
+@end
+
namespace WebKit {
WebViewImpl::WebViewImpl(NSView <WebViewImplDelegate> *view, WebPageProxy& page, PageClient& pageClient)
@@ -325,6 +340,10 @@
{
ASSERT(!m_inSecureInputState);
+#if WK_API_ENABLED
+ ASSERT(!m_thumbnailView);
+#endif
+
[m_layoutStrategy invalidate];
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
@@ -1553,6 +1572,81 @@
}
}
+void WebViewImpl::setAcceleratedCompositingRootLayer(CALayer *rootLayer)
+{
+ [rootLayer web_disableAllActions];
+
+ m_rootLayer = rootLayer;
+
+#if WK_API_ENABLED
+ if (m_thumbnailView) {
+ updateThumbnailViewLayer();
+ return;
+ }
+#endif
+
+ [CATransaction begin];
+ [CATransaction setDisableActions:YES];
+
+ if (rootLayer) {
+ if (!m_layerHostingView) {
+ // Create an NSView that will host our layer tree.
+ m_layerHostingView = adoptNS([[WKFlippedView alloc] initWithFrame:m_view.bounds]);
+ [m_layerHostingView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+
+ [m_view addSubview:m_layerHostingView.get() positioned:NSWindowBelow relativeTo:nil];
+
+ // Create a root layer that will back the NSView.
+ RetainPtr<CALayer> layer = adoptNS([[CALayer alloc] init]);
+ [layer setDelegate:[WebActionDisablingCALayerDelegate shared]];
+#ifndef NDEBUG
+ [layer setName:@"Hosting root layer"];
+#endif
+
+ [m_layerHostingView setLayer:layer.get()];
+ [m_layerHostingView setWantsLayer:YES];
+ }
+
+ [m_layerHostingView layer].sublayers = [NSArray arrayWithObject:rootLayer];
+ } else if (m_layerHostingView) {
+ [m_layerHostingView removeFromSuperview];
+ [m_layerHostingView setLayer:nil];
+ [m_layerHostingView setWantsLayer:NO];
+
+ m_layerHostingView = nullptr;
+ }
+
+ [CATransaction commit];
+}
+
+#if WK_API_ENABLED
+void WebViewImpl::setThumbnailView(_WKThumbnailView *thumbnailView)
+{
+ ASSERT(!m_thumbnailView || !thumbnailView);
+
+ m_thumbnailView = thumbnailView;
+
+ if (thumbnailView)
+ updateThumbnailViewLayer();
+ else
+ setAcceleratedCompositingRootLayer(m_rootLayer.get());
+}
+
+void WebViewImpl::reparentLayerTreeInThumbnailView()
+{
+ m_thumbnailView._thumbnailLayer = m_rootLayer.get();
+}
+
+void WebViewImpl::updateThumbnailViewLayer()
+{
+ _WKThumbnailView *thumbnailView = m_thumbnailView;
+ ASSERT(thumbnailView);
+
+ if (thumbnailView._waitingForSnapshot && m_view.window)
+ reparentLayerTreeInThumbnailView();
+}
+#endif // WK_API_ENABLED
+
} // namespace WebKit
#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191509 => 191510)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-23 20:50:34 UTC (rev 191509)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-23 21:03:08 UTC (rev 191510)
@@ -482,12 +482,12 @@
ASSERT(!layerTreeContext.isEmpty());
CALayer *renderLayer = WKMakeRenderLayer(layerTreeContext.contextID);
- [m_wkView _setAcceleratedCompositingModeRootLayer:renderLayer];
+ m_impl->setAcceleratedCompositingRootLayer(renderLayer);
}
void PageClientImpl::exitAcceleratedCompositingMode()
{
- [m_wkView _setAcceleratedCompositingModeRootLayer:nil];
+ m_impl->setAcceleratedCompositingRootLayer(nil);
}
void PageClientImpl::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
@@ -495,7 +495,7 @@
ASSERT(!layerTreeContext.isEmpty());
CALayer *renderLayer = WKMakeRenderLayer(layerTreeContext.contextID);
- [m_wkView _setAcceleratedCompositingModeRootLayer:renderLayer];
+ m_impl->setAcceleratedCompositingRootLayer(renderLayer);
}
void PageClientImpl::willEnterAcceleratedCompositingMode()
@@ -504,12 +504,12 @@
void PageClientImpl::setAcceleratedCompositingRootLayer(CALayer *rootLayer)
{
- [m_wkView _setAcceleratedCompositingModeRootLayer:rootLayer];
+ m_impl->setAcceleratedCompositingRootLayer(rootLayer);
}
CALayer *PageClientImpl::acceleratedCompositingRootLayer() const
{
- return m_wkView._acceleratedCompositingModeRootLayer;
+ return m_impl->acceleratedCompositingRootLayer();
}
PassRefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot()