<!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>[178202] branches/safari-600.1.4.15-branch/Source/WebKit2</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/178202">178202</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-09 14:26:37 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177163">r177163</a>. rdar://problem/19273192</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsh">branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsInternalh">branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-09 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r177163.
+
+ 2014-12-11 Yongjun Zhang <yongjun_zhang@apple.com>
+
+ WebKit2 should expose FirstVisuallyNonEmptyLayout rendering milestone.
+ https://bugs.webkit.org/show_bug.cgi?id=139514
+
+ Expose DidFirstVisuallyNonEmptyLayout so that WebKit2 client can listen to visually non-empty layout rendering event.
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/Cocoa/WKRenderingProgressEvents.h: Add WKRenderingProgressEventFirstVisuallyNonEmptyLayout to WKRenderingProgressEvents.
+ * Shared/API/Cocoa/WKRenderingProgressEventsInternal.h: Also map kWKDidFirstVisuallyNonEmptyLayout to WKRenderingProgressEventFirstVisuallyNonEmptyLayout.
+ (renderingProgressEvents):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (layoutMilestones): Map _WKRenderingProgressEventFirstVisuallyNonEmptyLayout to WebCore::DidFirstVisuallyNonEmptyLayout.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/NavigationState.mm: Add _WKRenderingProgressEventFirstVisuallyNonEmptyLayout to _WKRenderingProgressEventFirstLayout.
+ (WebKit::renderingProgressEvents): Map WebCore::DidFirstVisuallyNonEmptyLayout to _WKRenderingProgressEventFirstVisuallyNonEmptyLayout.
+
</ins><span class="cx"> 2015-01-08 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r173450.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEvents.h 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> typedef NS_OPTIONS(NSUInteger, WKRenderingProgressEvents)
</span><span class="cx"> {
</span><span class="cx"> WKRenderingProgressEventFirstLayout = 1 << 0,
</span><ins>+ WKRenderingProgressEventFirstVisuallyNonEmptyLayout = 1 << 1,
</ins><span class="cx"> WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2SharedAPICocoaWKRenderingProgressEventsInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/API/Cocoa/WKRenderingProgressEventsInternal.h 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> if (milestones & kWKDidFirstLayout)
</span><span class="cx"> events |= WKRenderingProgressEventFirstLayout;
</span><span class="cx">
</span><ins>+ if (milestones & kWKDidFirstVisuallyNonEmptyLayout)
+ events |= WKRenderingProgressEventFirstVisuallyNonEmptyLayout;
+
</ins><span class="cx"> if (milestones & kWKDidHitRelevantRepaintedObjectsAreaThreshold)
</span><span class="cx"> events |= WKRenderingProgressEventFirstPaintWithSignificantArea;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -1752,6 +1752,9 @@
</span><span class="cx"> if (events & _WKRenderingProgressEventFirstLayout)
</span><span class="cx"> milestones |= WebCore::DidFirstLayout;
</span><span class="cx">
</span><ins>+ if (events & _WKRenderingProgressEventFirstVisuallyNonEmptyLayout)
+ milestones |= WebCore::DidFirstVisuallyNonEmptyLayout;
+
</ins><span class="cx"> if (events & _WKRenderingProgressEventFirstPaintWithSignificantArea)
</span><span class="cx"> milestones |= WebCore::DidHitRelevantRepaintedObjectsAreaThreshold;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> typedef NS_OPTIONS(NSUInteger, _WKRenderingProgressEvents) {
</span><span class="cx"> _WKRenderingProgressEventFirstLayout = 1 << 0,
</span><ins>+ _WKRenderingProgressEventFirstVisuallyNonEmptyLayout = 1 << 1,
</ins><span class="cx"> _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
</span><span class="cx"> } WK_ENUM_AVAILABLE(10_10, 8_0);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (178201 => 178202)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-09 22:26:25 UTC (rev 178201)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-09 22:26:37 UTC (rev 178202)
</span><span class="lines">@@ -670,6 +670,9 @@
</span><span class="cx"> if (milestones & WebCore::DidFirstLayout)
</span><span class="cx"> events |= _WKRenderingProgressEventFirstLayout;
</span><span class="cx">
</span><ins>+ if (milestones & WebCore::DidFirstVisuallyNonEmptyLayout)
+ events |= _WKRenderingProgressEventFirstVisuallyNonEmptyLayout;
+
</ins><span class="cx"> if (milestones & WebCore::DidHitRelevantRepaintedObjectsAreaThreshold)
</span><span class="cx"> events |= _WKRenderingProgressEventFirstPaintWithSignificantArea;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>