Changeset 185880 in webkit

Timestamp:

Jun 23, 2015, 11:27:13 AM (10 years ago)

Author:

Simon Fraser

Message:

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:]):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (modified) (1 diff)
• Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEventsInternal.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/WK1BrowserWindowController.m (modified) (2 diffs)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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):
+
 2015-06-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -32 +32 @@
     _WKRenderingProgressEventFirstVisuallyNonEmptyLayout WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 1,
     _WKRenderingProgressEventFirstPaintWithSignificantArea = 1 << 2,
-    _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1 << 3
+    _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
 } WK_ENUM_AVAILABLE(10_10, 8_0);
 

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

@@ -46 +46 @@
         events |= _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold;
 
+    if (milestones & WebCore::DidFirstLayoutAfterSuppressedIncrementalRendering)
+        events |= _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering;
+
+    if (milestones & WebCore::DidFirstPaintAfterSuppressedIncrementalRendering)
+        events |= _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering;
+
     return events;
 }

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

@@ -2088 +2088 @@
         milestones |= WebCore::ReachedSessionRestorationRenderTreeSizeThreshold;
 
+    if (events & _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering)
+        milestones |= WebCore::DidFirstLayoutAfterSuppressedIncrementalRendering;
+
+    if (events & _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering)
+        milestones |= WebCore::DidFirstPaintAfterSuppressedIncrementalRendering;
+
     return milestones;
 }

trunk/Tools/ChangeLog

@@ +1 @@
+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:]):
+
 2015-06-23  Brady Eidson  <beidson@apple.com>
 

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -54 +54 @@
     [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
 
+    [_webView _listenForLayoutMilestones:WebDidFirstLayout | WebDidFirstVisuallyNonEmptyLayout | WebDidHitRelevantRepaintedObjectsAreaThreshold];
+
     [self didChangeSettings];
 
@@ -274 +276 @@
 }
 
+- (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");
+}
+
 - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
 {

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -72 +72 @@
     _webView.UIDelegate = self;
     
+    _webView._observedRenderingProgressEvents = _WKRenderingProgressEventFirstLayout
+        | _WKRenderingProgressEventFirstVisuallyNonEmptyLayout
+        | _WKRenderingProgressEventFirstPaintWithSignificantArea
+        | _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering
+        | _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering;
+
     _zoomTextOnly = NO;
 }
@@ -524 +530 @@
 }
 
+- (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");
+}
+
 @end