<!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>[185880] trunk</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/185880">185880</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-06-23 11:27:13 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose some more rendering progress events, and have MiniBrowser log for each of them
https://bugs.webkit.org/show_bug.cgi?id=146227
Reviewed by Darin Adler.
Source/WebKit2:
Add _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering and
_WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering to the private
header, and convert them to/from WebCore milestones.
* Shared/API/Cocoa/_WKRenderingProgressEvents.h:
* Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h:
(renderingProgressEvents):
* UIProcess/API/Cocoa/WKWebView.mm:
(layoutMilestones):
Tools:
Register for layout milestones/rendering progress events in the WK1 and WK2
browser window controllers, and, if logging is turned on, log when they are
reached.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController awakeFromNib]):
(-[WK1BrowserWindowController webView:didLayout:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController _webView:renderingProgressDidChange:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsh">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsInternalh">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ Expose some more rendering progress events, and have MiniBrowser log for each of them
+ https://bugs.webkit.org/show_bug.cgi?id=146227
+
+ Reviewed by Darin Adler.
+
+ Add _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering and
+ _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering to the private
+ header, and convert them to/from WebCore milestones.
+
+ * Shared/API/Cocoa/_WKRenderingProgressEvents.h:
+ * Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h:
+ (renderingProgressEvents):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (layoutMilestones):
+
</ins><span class="cx"> 2015-06-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ build after r185876 and r185877.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><span class="cx"> _WKRenderingProgressEventFirstLayout = 1 << 0,
</span><span class="cx"> _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
</span><span class="cx"> _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
</span><del>- _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3
</del><ins>+ _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3,
+ _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 4,
+ _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 5
</ins><span class="cx"> } WK_ENUM_AVAILABLE(10_10, 8_0);
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRenderingProgressEventsInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -45,6 +45,12 @@
</span><span class="cx"> if (milestones & WebCore::ReachedSessionRestorationRenderTreeSizeThreshold)
</span><span class="cx"> events |= _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold;
</span><span class="cx">
</span><ins>+ if (milestones & WebCore::DidFirstLayoutAfterSuppressedIncrementalRendering)
+ events |= _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering;
+
+ if (milestones & WebCore::DidFirstPaintAfterSuppressedIncrementalRendering)
+ events |= _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering;
+
</ins><span class="cx"> return events;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -2087,6 +2087,12 @@
</span><span class="cx"> if (events & _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold)
</span><span class="cx"> milestones |= WebCore::ReachedSessionRestorationRenderTreeSizeThreshold;
</span><span class="cx">
</span><ins>+ if (events & _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering)
+ milestones |= WebCore::DidFirstLayoutAfterSuppressedIncrementalRendering;
+
+ if (events & _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering)
+ milestones |= WebCore::DidFirstPaintAfterSuppressedIncrementalRendering;
+
</ins><span class="cx"> return milestones;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Tools/ChangeLog 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ Expose some more rendering progress events, and have MiniBrowser log for each of them
+ https://bugs.webkit.org/show_bug.cgi?id=146227
+
+ Reviewed by Darin Adler.
+
+ Register for layout milestones/rendering progress events in the WK1 and WK2
+ browser window controllers, and, if logging is turned on, log when they are
+ reached.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController awakeFromNib]):
+ (-[WK1BrowserWindowController webView:didLayout:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController _webView:renderingProgressDidChange:]):
+
</ins><span class="cx"> 2015-06-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WKFrameInfo should have an accessor for the Frame's current security origin.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setImageControlsEnabled:YES];
</span><span class="cx"> [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
</span><span class="cx">
</span><ins>+ [_webView _listenForLayoutMilestones:WebDidFirstLayout | WebDidFirstVisuallyNonEmptyLayout | WebDidHitRelevantRepaintedObjectsAreaThreshold];
+
</ins><span class="cx"> [self didChangeSettings];
</span><span class="cx">
</span><span class="cx"> [containerView addSubview:_webView];
</span><span class="lines">@@ -273,6 +275,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)webView:(WebView *)sender didLayout:(WebLayoutMilestones)milestones
+{
+ if (milestones & WebDidFirstLayout)
+ LOG(@"layout milestone: %@", @"first layout");
+
+ if (milestones & WebDidFirstVisuallyNonEmptyLayout)
+ LOG(@"layout milestone: %@", @"first non-empty layout");
+
+ if (milestones & WebDidHitRelevantRepaintedObjectsAreaThreshold)
+ LOG(@"layout milestone: %@", @"relevant repainted objects area threshold");
+}
+
</ins><span class="cx"> - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
</span><span class="cx"> {
</span><span class="cx"> [listener use];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (185879 => 185880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-06-23 18:04:08 UTC (rev 185879)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-06-23 18:27:13 UTC (rev 185880)
</span><span class="lines">@@ -71,6 +71,12 @@
</span><span class="cx"> _webView.navigationDelegate = self;
</span><span class="cx"> _webView.UIDelegate = self;
</span><span class="cx">
</span><ins>+ _webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout
+ | _WKRenderingProgressEventFirstVisuallyNonEmptyLayout
+ | _WKRenderingProgressEventFirstPaintWithSignificantArea
+ | _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering
+ | _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering;
+
</ins><span class="cx"> _zoomTextOnly = NO;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -523,6 +529,24 @@
</span><span class="cx"> [self reload:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_webView:(WKWebView *)webView renderingProgressDidChange:(_WKRenderingProgressEvents)progressEvents
+{
+ if (progressEvents & _WKRenderingProgressEventFirstLayout)
+ LOG(@"renderingProgressDidChange: %@", @"first layout");
+
+ if (progressEvents & _WKRenderingProgressEventFirstVisuallyNonEmptyLayout)
+ LOG(@"renderingProgressDidChange: %@", @"first visually non-empty layout");
+
+ if (progressEvents & _WKRenderingProgressEventFirstPaintWithSignificantArea)
+ LOG(@"renderingProgressDidChange: %@", @"first paint with significant area");
+
+ if (progressEvents & _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering)
+ LOG(@"renderingProgressDidChange: %@", @"first layout after suppressed incremental rendering");
+
+ if (progressEvents & _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering)
+ LOG(@"renderingProgressDidChange: %@", @"first paint after suppressed incremental rendering");
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre>
</div>
</div>
</body>
</html>