<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211929] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211929">211929</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-08 21:22:51 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePageOverlayControllercpp">trunk/Source/WebCore/page/PageOverlayController.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-02-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r211912.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageOverlayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageOverlayController.cpp (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -66,10 +66,8 @@
</span><span class="cx">
</span><span class="cx"> m_documentOverlayRootLayer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
</span><span class="cx"> m_viewOverlayRootLayer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
</span><del>-#ifndef NDEBUG
- m_documentOverlayRootLayer->setName("Page Overlay container (document-relative)");
- m_viewOverlayRootLayer->setName("Page Overlay container (view-relative)");
-#endif
</del><ins>+ m_documentOverlayRootLayer->setName("Document overlay Container");
+ m_viewOverlayRootLayer->setName("View overlay container");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GraphicsLayer* PageOverlayController::documentOverlayRootLayer() const
</span><span class="lines">@@ -149,9 +147,7 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> layer = GraphicsLayer::create(m_mainFrame.page()->chrome().client().graphicsLayerFactory(), *this);
</span><span class="cx"> layer->setAnchorPoint(FloatPoint3D());
</span><span class="cx"> layer->setBackgroundColor(overlay.backgroundColor());
</span><del>-#ifndef NDEBUG
- layer->setName("Page Overlay content");
-#endif
</del><ins>+ layer->setName("Overlay content");
</ins><span class="cx">
</span><span class="cx"> updateSettingsForLayer(*layer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-02-08 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Custom protocols should not continue loading after a network process crash
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1133,6 +1133,7 @@
</span><span class="cx"> ASSERT(representationClass);
</span><span class="cx"> _customContentView = adoptNS([[representationClass alloc] web_initWithFrame:self.bounds webView:self]);
</span><span class="cx"> _customContentFixedOverlayView = adoptNS([[UIView alloc] initWithFrame:self.bounds]);
</span><ins>+ [_customContentFixedOverlayView layer].name = @"CustomContentFixedOverlay";
</ins><span class="cx"> [_customContentFixedOverlayView setUserInteractionEnabled:NO];
</span><span class="cx">
</span><span class="cx"> [[_contentView unscaledView] removeFromSuperview];
</span><span class="lines">@@ -4402,6 +4403,7 @@
</span><span class="cx">
</span><span class="cx"> NSUInteger indexOfContentView = [[_scrollView subviews] indexOfObject:_contentView.get()];
</span><span class="cx"> _resizeAnimationView = adoptNS([[UIView alloc] init]);
</span><ins>+ [_resizeAnimationView layer].name = @"ResizeAnimation";
</ins><span class="cx"> [_scrollView insertSubview:_resizeAnimationView.get() atIndex:indexOfContentView];
</span><span class="cx"> [_resizeAnimationView addSubview:_contentView.get()];
</span><span class="cx"> [_resizeAnimationView addSubview:[_contentView unscaledView]];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -187,6 +187,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIViewController> snapshotViewController = adoptNS([[UIViewController alloc] init]);
</span><span class="cx"> m_snapshotView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
</span><ins>+ [m_snapshotView layer].name = @"SwipeSnapshot";
</ins><span class="cx">
</span><span class="cx"> RetainPtr<UIColor> backgroundColor = [UIColor whiteColor];
</span><span class="cx"> if (ViewSnapshot* snapshot = targetItem->snapshot()) {
</span><span class="lines">@@ -206,7 +207,10 @@
</span><span class="cx"> [snapshotViewController setView:m_snapshotView.get()];
</span><span class="cx">
</span><span class="cx"> m_transitionContainerView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
</span><ins>+ [m_transitionContainerView layer].name = @"SwipeTransitionContainer";
</ins><span class="cx"> m_liveSwipeViewClippingView = adoptNS([[UIView alloc] initWithFrame:liveSwipeViewFrame]);
</span><ins>+ [m_liveSwipeViewClippingView layer].name = @"LiveSwipeViewClipping";
+
</ins><span class="cx"> [m_liveSwipeViewClippingView setClipsToBounds:YES];
</span><span class="cx">
</span><span class="cx"> [m_liveSwipeView.superview insertSubview:m_transitionContainerView.get() belowSubview:m_liveSwipeView];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -203,15 +203,14 @@
</span><span class="cx"> WebProcessPool::statistics().wkViewCount++;
</span><span class="cx">
</span><span class="cx"> _rootContentView = adoptNS([[UIView alloc] init]);
</span><ins>+ [_rootContentView layer].name = @"RootContent";
</ins><span class="cx"> [_rootContentView layer].masksToBounds = NO;
</span><span class="cx"> [_rootContentView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
</span><span class="cx">
</span><span class="cx"> _fixedClippingView = adoptNS([[UIView alloc] init]);
</span><ins>+ [_fixedClippingView layer].name = @"FixedClipping";
</ins><span class="cx"> [_fixedClippingView layer].masksToBounds = YES;
</span><span class="cx"> [_fixedClippingView layer].anchorPoint = CGPointZero;
</span><del>-#ifndef NDEBUG
- [[_fixedClippingView layer] setName:@"Fixed clipping"];
-#endif
</del><span class="cx">
</span><span class="cx"> [self addSubview:_fixedClippingView.get()];
</span><span class="cx"> [_fixedClippingView addSubview:_rootContentView.get()];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -541,6 +541,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!_interactionViewsContainerView) {
</span><span class="cx"> _interactionViewsContainerView = adoptNS([[UIView alloc] init]);
</span><ins>+ [_interactionViewsContainerView layer].name = @"InteractionViewsContainer";
</ins><span class="cx"> [_interactionViewsContainerView setOpaque:NO];
</span><span class="cx"> [_interactionViewsContainerView layer].anchorPoint = CGPointZero;
</span><span class="cx"> [self.superview addSubview:_interactionViewsContainerView.get()];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -151,6 +151,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayer> paintLayer = GraphicsLayer::create(m_page->drawingArea()->graphicsLayerFactory(), *m_paintIndicatorLayerClient);
</span><span class="cx">
</span><ins>+ paintLayer->setName("paint rect");
</ins><span class="cx"> paintLayer->setAnchorPoint(FloatPoint3D());
</span><span class="cx"> paintLayer->setPosition(rect.location());
</span><span class="cx"> paintLayer->setSize(rect.size());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (211928 => 211929)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> webPage.corePage()->settings().setDelegatesPageScaling(true);
</span><span class="cx"> #endif
</span><ins>+ m_rootLayer->setName("drawing area root");
</ins><span class="cx">
</span><span class="cx"> m_commitQueue = dispatch_queue_create("com.apple.WebKit.WebContent.RemoteLayerTreeDrawingArea.CommitQueue", nullptr);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>