Diff
Modified: trunk/Source/WebCore/ChangeLog (211928 => 211929)
--- trunk/Source/WebCore/ChangeLog 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 05:22:51 UTC (rev 211929)
@@ -1,3 +1,16 @@
+2017-02-08 Simon Fraser <[email protected]>
+
+ Put names on more UIViews for ease of debugging
+ https://bugs.webkit.org/show_bug.cgi?id=168035
+
+ Reviewed by Tim Horton.
+
+ Name the page overlay layers.
+
+ * page/PageOverlayController.cpp:
+ (WebCore::PageOverlayController::createRootLayersIfNeeded):
+ (WebCore::PageOverlayController::installPageOverlay):
+
2017-02-08 Commit Queue <[email protected]>
Unreviewed, rolling out r211912.
Modified: trunk/Source/WebCore/page/PageOverlayController.cpp (211928 => 211929)
--- trunk/Source/WebCore/page/PageOverlayController.cpp 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebCore/page/PageOverlayController.cpp 2017-02-09 05:22:51 UTC (rev 211929)
@@ -66,10 +66,8 @@
m_documentOverlayRootLayer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
m_viewOverlayRootLayer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
-#ifndef NDEBUG
- m_documentOverlayRootLayer->setName("Page Overlay container (document-relative)");
- m_viewOverlayRootLayer->setName("Page Overlay container (view-relative)");
-#endif
+ m_documentOverlayRootLayer->setName("Document overlay Container");
+ m_viewOverlayRootLayer->setName("View overlay container");
}
GraphicsLayer* PageOverlayController::documentOverlayRootLayer() const
@@ -149,9 +147,7 @@
std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
layer->setAnchorPoint(FloatPoint3D());
layer->setBackgroundColor(overlay.backgroundColor());
-#ifndef NDEBUG
- layer->setName("Page Overlay content");
-#endif
+ layer->setName("Overlay content");
updateSettingsForLayer(*layer);
Modified: trunk/Source/WebKit2/ChangeLog (211928 => 211929)
--- trunk/Source/WebKit2/ChangeLog 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-09 05:22:51 UTC (rev 211929)
@@ -1,3 +1,26 @@
+2017-02-08 Simon Fraser <[email protected]>
+
+ Put names on more UIViews for ease of debugging
+ https://bugs.webkit.org/show_bug.cgi?id=168035
+
+ Reviewed by Tim Horton.
+
+ Put names on the various bare UIViews that we create.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+ (-[WKWebView _beginAnimatedResizeWithUpdates:]):
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+ (WebKit::WebInspectorClient::showPaintRect):
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
+
2017-02-08 Andy Estes <[email protected]>
Custom protocols should not continue loading after a network process crash
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211928 => 211929)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-09 05:22:51 UTC (rev 211929)
@@ -1133,6 +1133,7 @@
ASSERT(representationClass);
_customContentView = adoptNS([[representationClass alloc] web_initWithFrame:self.bounds webView:self]);
_customContentFixedOverlayView = adoptNS([[UIView alloc] initWithFrame:self.bounds]);
+ [_customContentFixedOverlayView layer].name = @"CustomContentFixedOverlay";
[_customContentFixedOverlayView setUserInteractionEnabled:NO];
[[_contentView unscaledView] removeFromSuperview];
@@ -4402,6 +4403,7 @@
NSUInteger indexOfContentView = [[_scrollView subviews] indexOfObject:_contentView.get()];
_resizeAnimationView = adoptNS([[UIView alloc] init]);
+ [_resizeAnimationView layer].name = @"ResizeAnimation";
[_scrollView insertSubview:_resizeAnimationView.get() atIndex:indexOfContentView];
[_resizeAnimationView addSubview:_contentView.get()];
[_resizeAnimationView addSubview:[_contentView unscaledView]];
Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (211928 => 211929)
--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2017-02-09 05:22:51 UTC (rev 211929)
@@ -187,6 +187,7 @@
RetainPtr<UIViewController> snapshotViewController = adoptNS([[UIViewController alloc] init]);
m_snapshotView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
+ [m_snapshotView layer].name = @"SwipeSnapshot";
RetainPtr<UIColor> backgroundColor = [UIColor whiteColor];
if (ViewSnapshot* snapshot = targetItem->snapshot()) {
@@ -206,7 +207,10 @@
[snapshotViewController setView:m_snapshotView.get()];
m_transitionContainerView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
+ [m_transitionContainerView layer].name = @"SwipeTransitionContainer";
m_liveSwipeViewClippingView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
+ [m_liveSwipeViewClippingView layer].name = @"LiveSwipeViewClipping";
+
[m_liveSwipeViewClippingView setClipsToBounds:YES];
[m_liveSwipeView.superview insertSubview:m_transitionContainerView.get() belowSubview:m_liveSwipeView];
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (211928 => 211929)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2017-02-09 05:22:51 UTC (rev 211929)
@@ -203,15 +203,14 @@
WebProcessPool::statistics().wkViewCount++;
_rootContentView = adoptNS([[UIView alloc] init]);
+ [_rootContentView layer].name = @"RootContent";
[_rootContentView layer].masksToBounds = NO;
[_rootContentView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
_fixedClippingView = adoptNS([[UIView alloc] init]);
+ [_fixedClippingView layer].name = @"FixedClipping";
[_fixedClippingView layer].masksToBounds = YES;
[_fixedClippingView layer].anchorPoint = CGPointZero;
-#ifndef NDEBUG
- [[_fixedClippingView layer] setName:@"Fixed clipping"];
-#endif
[self addSubview:_fixedClippingView.get()];
[_fixedClippingView addSubview:_rootContentView.get()];
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211928 => 211929)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-02-09 05:22:51 UTC (rev 211929)
@@ -541,6 +541,7 @@
{
if (!_interactionViewsContainerView) {
_interactionViewsContainerView = adoptNS([[UIView alloc] init]);
+ [_interactionViewsContainerView layer].name = @"InteractionViewsContainer";
[_interactionViewsContainerView setOpaque:NO];
[_interactionViewsContainerView layer].anchorPoint = CGPointZero;
[self.superview addSubview:_interactionViewsContainerView.get()];
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (211928 => 211929)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2017-02-09 05:22:51 UTC (rev 211929)
@@ -151,6 +151,7 @@
std::unique_ptr<GraphicsLayer> paintLayer = GraphicsLayer::create(m_page->drawingArea()->graphicsLayerFactory(), *m_paintIndicatorLayerClient);
+ paintLayer->setName("paint rect");
paintLayer->setAnchorPoint(FloatPoint3D());
paintLayer->setPosition(rect.location());
paintLayer->setSize(rect.size());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (211928 => 211929)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-02-09 05:10:11 UTC (rev 211928)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2017-02-09 05:22:51 UTC (rev 211929)
@@ -77,6 +77,7 @@
#if PLATFORM(IOS)
webPage.corePage()->settings().setDelegatesPageScaling(true);
#endif
+ m_rootLayer->setName("drawing area root");
m_commitQueue = dispatch_queue_create("com.apple.WebKit.WebContent.RemoteLayerTreeDrawingArea.CommitQueue", nullptr);
