Changeset 202586 in webkit


Ignore:
Timestamp:
Jun 28, 2016 2:10:32 PM (8 years ago)
Author:
timothy_horton@apple.com
Message:

Keep track of when a WKWebView is blank before the initial non-empty layout
https://bugs.webkit.org/show_bug.cgi?id=159217
<rdar://problem/26071766>

Reviewed by Beth Dakin.

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]):
(-[WKWebView _didFirstVisuallyNonEmptyLayoutForMainFrame]):

  • UIProcess/API/Cocoa/WKWebViewInternal.h:
  • UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame):

Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r202581 r202586  
     12016-06-28  Tim Horton  <timothy_horton@apple.com>
     2
     3        Keep track of when a WKWebView is blank before the initial non-empty layout
     4        https://bugs.webkit.org/show_bug.cgi?id=159217
     5        <rdar://problem/26071766>
     6
     7        Reviewed by Beth Dakin.
     8
     9        * UIProcess/API/Cocoa/WKWebView.mm:
     10        (-[WKWebView _initializeWithConfiguration:]):
     11        (-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]):
     12        (-[WKWebView _didFirstVisuallyNonEmptyLayoutForMainFrame]):
     13        * UIProcess/API/Cocoa/WKWebViewInternal.h:
     14        * UIProcess/ios/PageClientImplIOS.mm:
     15        (WebKit::PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame):
     16
    1172016-06-28  Anders Carlsson  <andersca@apple.com>
    218
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r202444 r202586  
    158158#endif // PLATFORM(IOS)
    159159
     160#if USE(APPLE_INTERNAL_SDK)
     161#import <WebKitAdditions/WKWebViewAdditions.mm>
     162#endif
     163
    160164#if PLATFORM(IOS)
    161165static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
     
    491495    [_scrollView setBouncesZoom:YES];
    492496
     497    [self _setIsBlankBeforeFirstNonEmptyLayout:YES];
     498
    493499    [self addSubview:_scrollView.get()];
    494500
     
    17511757}
    17521758
     1759#if !USE(APPLE_INTERNAL_SDK)
     1760- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
     1761{
     1762}
     1763#endif
     1764
    17531765#pragma mark - UIScrollViewDelegate
    17541766
     
    20752087        isChangingObscuredInsetsInteractively:_isChangingObscuredInsetsInteractively
    20762088        enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
     2089}
     2090
     2091- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
     2092{
     2093    [self _setIsBlankBeforeFirstNonEmptyLayout:NO];
    20772094}
    20782095
     
    46204637@end
    46214638
    4622 #if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
    4623 #import <WebKitAdditions/WKWebViewAdditions.mm>
    4624 #endif
    4625 
    4626 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
    4627 #import <WebKitAdditions/WKWebViewAdditionsMac.mm>
    4628 #endif
    4629 
    46304639#endif // WK_API_ENABLED
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

    r201888 r202586  
    104104- (void)_updateContentRectsWithState:(BOOL)inStableState;
    105105
     106- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
    106107- (void)_didFinishLoadForMainFrame;
    107108- (void)_didFailLoadForMainFrame;
  • trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

    r202183 r202586  
    703703void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
    704704{
     705    [m_webView _didFirstVisuallyNonEmptyLayoutForMainFrame];
    705706}
    706707
Note: See TracChangeset for help on using the changeset viewer.