<!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>[160602] trunk/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/160602">160602</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-12-14 15:24:47 -0800 (Sat, 14 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Expose some layout milestones
https://bugs.webkit.org/show_bug.cgi?id=125721
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKBrowsingContextController.h:
(WKRenderingProgressEvents): Declared new enum.
(@interface WKBrowsingContextController): Declared new observedRenderingProgressEvents
property.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(layoutMilestones): Added helper to translate rendering progress events into layout
milestones.
(-[WKBrowsingContextController setObservedRenderingProgressEvents:]): Added this setter.
Sets the ivar and calls WebPageProxy::listenForLayoutMilestones.
(renderingProgressEvents): Added helper to translate layout milestones into rendering
progress events.
(didLayout): Implemented this WKPageLoaderClient callback by calling the load delegate.
(setUpPageLoaderClient): Set the above callback in the client structure.
* UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Declared new delegate method.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160601 => 160602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-14 21:49:19 UTC (rev 160601)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-14 23:24:47 UTC (rev 160602)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2013-12-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Cocoa] Expose some layout milestones
+ https://bugs.webkit.org/show_bug.cgi?id=125721
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.h:
+ (WKRenderingProgressEvents): Declared new enum.
+ (@interface WKBrowsingContextController): Declared new observedRenderingProgressEvents
+ property.
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (layoutMilestones): Added helper to translate rendering progress events into layout
+ milestones.
+ (-[WKBrowsingContextController setObservedRenderingProgressEvents:]): Added this setter.
+ Sets the ivar and calls WebPageProxy::listenForLayoutMilestones.
+ (renderingProgressEvents): Added helper to translate layout milestones into rendering
+ progress events.
+ (didLayout): Implemented this WKPageLoaderClient callback by calling the load delegate.
+ (setUpPageLoaderClient): Set the above callback in the client structure.
+ * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Declared new delegate method.
+
+2013-12-14 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Clarify Owners’ role
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125739
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (160601 => 160602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-12-14 21:49:19 UTC (rev 160601)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-12-14 23:24:47 UTC (rev 160602)
</span><span class="lines">@@ -36,6 +36,11 @@
</span><span class="cx"> @protocol WKBrowsingContextLoadDelegate;
</span><span class="cx"> @protocol WKBrowsingContextPolicyDelegate;
</span><span class="cx">
</span><ins>+typedef NS_OPTIONS(NSUInteger, WKRenderingProgressEvents) {
+ WKRenderingProgressEventFirstLayout = 1 << 0,
+ WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
+};
+
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBrowsingContextController : NSObject
</span><span class="cx">
</span><span class="lines">@@ -121,6 +126,8 @@
</span><span class="cx">
</span><span class="cx"> @property(readonly) double estimatedProgress;
</span><span class="cx">
</span><ins>+@property WKRenderingProgressEvents observedRenderingProgressEvents;
+
</ins><span class="cx"> #pragma mark Active Document Introspection
</span><span class="cx">
</span><span class="cx"> /* Title of the document associated with the active load. */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160601 => 160602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-14 21:49:19 UTC (rev 160601)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-14 23:24:47 UTC (rev 160602)
</span><span class="lines">@@ -333,6 +333,25 @@
</span><span class="cx"> return _page->estimatedProgress();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline LayoutMilestones layoutMilestones(WKRenderingProgressEvents events)
+{
+ LayoutMilestones milestones = 0;
+
+ if (events & WKRenderingProgressEventFirstLayout)
+ milestones |= DidFirstLayout;
+
+ if (events & WKRenderingProgressEventFirstPaintWithSignificantArea)
+ milestones |= DidHitRelevantRepaintedObjectsAreaThreshold;
+
+ return milestones;
+}
+
+- (void)setObservedRenderingProgressEvents:(WKRenderingProgressEvents)events
+{
+ _observedRenderingProgressEvents = events;
+ _page->listenForLayoutMilestones(layoutMilestones(events));
+}
+
</ins><span class="cx"> #pragma mark Active Document Introspection
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="lines">@@ -521,6 +540,28 @@
</span><span class="cx"> [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline WKRenderingProgressEvents renderingProgressEvents(WKLayoutMilestones milestones)
+{
+ WKRenderingProgressEvents events = 0;
+
+ if (milestones & kWKDidFirstLayout)
+ events |= WKRenderingProgressEventFirstLayout;
+
+ if (milestones & kWKDidHitRelevantRepaintedObjectsAreaThreshold)
+ events |= WKRenderingProgressEventFirstPaintWithSignificantArea;
+
+ return events;
+}
+
+static void didLayout(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef userData, const void* clientInfo)
+{
+ WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto loadDelegate = browsingContext->_loadDelegate.get();
+
+ if ([loadDelegate respondsToSelector:@selector(browsingContextController:renderingProgressDidChange:)])
+ [loadDelegate browsingContextController:browsingContext renderingProgressDidChange:renderingProgressEvents(milestones)];
+}
+
</ins><span class="cx"> static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
</span><span class="cx"> {
</span><span class="cx"> WKPageLoaderClientV3 loaderClient;
</span><span class="lines">@@ -545,6 +586,8 @@
</span><span class="cx">
</span><span class="cx"> loaderClient.processDidCrash = processDidCrash;
</span><span class="cx">
</span><ins>+ loaderClient.didLayout = didLayout;
+
</ins><span class="cx"> page.initializeLoaderClient(&loaderClient.base);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (160601 => 160602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2013-12-14 21:49:19 UTC (rev 160601)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h 2013-12-14 23:24:47 UTC (rev 160602)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-@class WKBrowsingContextController;
</del><ins>+#import <WebKit2/WKBrowsingContextController.h>
+
</ins><span class="cx"> @class WKBackForwardListItem;
</span><span class="cx">
</span><span class="cx"> @protocol WKBrowsingContextLoadDelegate <NSObject>
</span><span class="lines">@@ -55,4 +56,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)browsingContextControllerDidChangeBackForwardList:(WKBrowsingContextController *)sender addedItem:(WKBackForwardListItem *)addedItem removedItems:(NSArray *)removedItems;
</span><span class="cx">
</span><ins>+- (void)browsingContextController:(WKBrowsingContextController *)sender renderingProgressDidChange:(WKRenderingProgressEvents)progressEvent;
+
</ins><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>