Changeset 186586 in webkit

Timestamp:

Jul 9, 2015 12:01:49 AM (9 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Report the first paint after committing a load as a rendering progress event
​https://bugs.webkit.org/show_bug.cgi?id=146765

Reviewed by Tim Horton.

• Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added _WKRenderingProgressEventFirstPaint.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _didCommitLayerTree:]): If this is the first layer tree commit since the load
was committed, and the delegate is observing _WKRenderingProgressEventFirstPaint, call
NavigationState::didFirstPaint.

• UIProcess/Cocoa/NavigationState.h:
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::didFirstPaint): Added. Calls -_webView:renderingProgressDidChange:
with _WKRenderingProgressEventFirstPaint.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/_WKRenderingProgressEvents.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-09  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Report the first paint after committing a load as a rendering progress event
+        https://bugs.webkit.org/show_bug.cgi?id=146765
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added _WKRenderingProgressEventFirstPaint.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _didCommitLayerTree:]): If this is the first layer tree commit since the load
+        was committed, and the delegate is observing _WKRenderingProgressEventFirstPaint, call
+        NavigationState::didFirstPaint.
+
+        * UIProcess/Cocoa/NavigationState.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::didFirstPaint): Added. Calls -_webView:renderingProgressDidChange:
+        with _WKRenderingProgressEventFirstPaint.
+
 2015-07-08  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h

@@ -34 +34 @@
     _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
+    _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 5,
+    _WKRenderingProgressEventFirstPaint WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 6,
 } WK_ENUM_AVAILABLE(10_10, 8_0);
 

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

@@ -972 +972 @@
         [_scrollView setContentOffset:[self _adjustedContentOffset:CGPointZero]];
         [self _updateVisibleContentRects];
+        if (_observedRenderingProgressEvents & _WKRenderingProgressEventFirstPaint)
+            _navigationState->didFirstPaint();
     }
 

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h

@@ -73 +73 @@
     void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&);
     void willRecordNavigationSnapshot(WebBackForwardListItem&);
+
+    void didFirstPaint();
 
 private:

trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm

@@ -225 +225 @@
 }
 
+void NavigationState::didFirstPaint()
+{
+    if (!m_navigationDelegateMethods.webViewRenderingProgressDidChange)
+        return;
+
+    auto navigationDelegate = m_navigationDelegate.get();
+    if (!navigationDelegate)
+        return;
+
+    [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate) _webView:m_webView renderingProgressDidChange:_WKRenderingProgressEventFirstPaint];
+}
+
 NavigationState::NavigationClient::NavigationClient(NavigationState& navigationState)
     : m_navigationState(navigationState)