Changeset 211929 in webkit

Timestamp:

Feb 8, 2017, 9:22:51 PM (8 years ago)

Author:

Simon Fraser

Message:

Put names on more UIViews for ease of debugging
​https://bugs.webkit.org/show_bug.cgi?id=168035

Reviewed by Tim Horton.

Source/WebCore:

Name the page overlay layers.

• page/PageOverlayController.cpp:

(WebCore::PageOverlayController::createRootLayersIfNeeded):
(WebCore::PageOverlayController::installPageOverlay):

Source/WebKit2:

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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/PageOverlayController.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)
• WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (modified) (2 diffs)
• WebKit2/UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebKit2/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-08  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <commit-queue@webkit.org>
 

trunk/Source/WebCore/page/PageOverlayController.cpp

@@ -67 +67 @@
     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");
 }
 
@@ -150 +148 @@
     layer->setAnchorPoint(FloatPoint3D());
     layer->setBackgroundColor(overlay.backgroundColor());
-#ifndef NDEBUG
-    layer->setName("Page Overlay content");
-#endif
+    layer->setName("Overlay content");
 
     updateSettingsForLayer(*layer);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-08  Simon Fraser  <simon.fraser@apple.com>
+
+        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  <aestes@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1134 +1134 @@
         _customContentView = adoptNS([[representationClass alloc] web_initWithFrame:self.bounds webView:self]);
         _customContentFixedOverlayView = adoptNS([[UIView alloc] initWithFrame:self.bounds]);
+        [_customContentFixedOverlayView layer].name = @"CustomContentFixedOverlay";
         [_customContentFixedOverlayView setUserInteractionEnabled:NO];
 
@@ -4403 +4404 @@
     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()];

trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm

@@ -188 +188 @@
     RetainPtr<UIViewController> snapshotViewController = adoptNS([[UIViewController alloc] init]);
     m_snapshotView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
+    [m_snapshotView layer].name = @"SwipeSnapshot";
 
     RetainPtr<UIColor> backgroundColor = [UIColor whiteColor];
@@ -207 +208 @@
 
     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];
 

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -204 +204 @@
 
     _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()];

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -542 +542 @@
     if (!_interactionViewsContainerView) {
         _interactionViewsContainerView = adoptNS([[UIView alloc] init]);
+        [_interactionViewsContainerView layer].name = @"InteractionViewsContainer";
         [_interactionViewsContainerView setOpaque:NO];
         [_interactionViewsContainerView layer].anchorPoint = CGPointZero;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp

@@ -152 +152 @@
     std::unique_ptr<GraphicsLayer> paintLayer = GraphicsLayer::create(m_page->drawingArea()->graphicsLayerFactory(), *m_paintIndicatorLayerClient);
     
+    paintLayer->setName("paint rect");
     paintLayer->setAnchorPoint(FloatPoint3D());
     paintLayer->setPosition(rect.location());

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

@@ -78 +78 @@
     webPage.corePage()->settings().setDelegatesPageScaling(true);
 #endif
+    m_rootLayer->setName("drawing area root");
 
     m_commitQueue = dispatch_queue_create("com.apple.WebKit.WebContent.RemoteLayerTreeDrawingArea.CommitQueue", nullptr);