Changeset 160602 in webkit

Timestamp:

Dec 14, 2013 3:24:47 PM (10 years ago)

Author:

mitz@apple.com

Message:

[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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-14  Dan Bernstein  <mitz@apple.com>
+
+        [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>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h

@@ -36 +36 @@
 @protocol WKBrowsingContextLoadDelegate;
 @protocol WKBrowsingContextPolicyDelegate;
+
+typedef NS_OPTIONS(NSUInteger, WKRenderingProgressEvents) {
+    WKRenderingProgressEventFirstLayout = 1 << 0,
+    WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
+};
 
 WK_API_CLASS
@@ -122 +127 @@
 @property(readonly) double estimatedProgress;
 
+@property WKRenderingProgressEvents observedRenderingProgressEvents;
+
 #pragma mark Active Document Introspection
 

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

@@ -334 +334 @@
 }
 
+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));
+}
+
 #pragma mark Active Document Introspection
 
@@ -520 +539 @@
     if ([loadDelegate respondsToSelector:@selector(browsingContextControllerWebProcessDidCrash:)])
         [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
+}
+
+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)];
 }
 
@@ -545 +586 @@
 
     loaderClient.processDidCrash = processDidCrash;
+
+    loaderClient.didLayout = didLayout;
 
     page.initializeLoaderClient(&loaderClient.base);

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h

@@ -26 +26 @@
 #import <Foundation/Foundation.h>
 
-@class WKBrowsingContextController;
+#import <WebKit2/WKBrowsingContextController.h>
+
 @class WKBackForwardListItem;
 
@@ -56 +57 @@
 - (void)browsingContextControllerDidChangeBackForwardList:(WKBrowsingContextController *)sender addedItem:(WKBackForwardListItem *)addedItem removedItems:(NSArray *)removedItems;
 
+- (void)browsingContextController:(WKBrowsingContextController *)sender renderingProgressDidChange:(WKRenderingProgressEvents)progressEvent;
+
 @end