Skip to content
Permalink
Browse files
Unreviewed, rolling out r202586 and r202595.
https://bugs.webkit.org/show_bug.cgi?id=159247

These changes broke the iOS build (Requested by ryanhaddad on
#webkit).

Reverted changesets:

"Keep track of when a WKWebView is blank before the initial
non-empty layout"
https://bugs.webkit.org/show_bug.cgi?id=159217
http://trac.webkit.org/changeset/202586

"Try to fix the build."
http://trac.webkit.org/changeset/202595

Patch by Commit Queue <commit-queue@webkit.org> on 2016-06-28

Canonical link: https://commits.webkit.org/177359@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202612 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue authored and ryanhaddad committed Jun 29, 2016
1 parent 4e5ce15 commit 6f9dc77f9007f12a8a8fc8eff1953a85a0f750e2
@@ -1,3 +1,21 @@
2016-06-28 Commit Queue <commit-queue@webkit.org>

Unreviewed, rolling out r202586 and r202595.
https://bugs.webkit.org/show_bug.cgi?id=159247

These changes broke the iOS build (Requested by ryanhaddad on
#webkit).

Reverted changesets:

"Keep track of when a WKWebView is blank before the initial
non-empty layout"
https://bugs.webkit.org/show_bug.cgi?id=159217
http://trac.webkit.org/changeset/202586

"Try to fix the build."
http://trac.webkit.org/changeset/202595

2016-06-28 Commit Queue <commit-queue@webkit.org>

Unreviewed, rolling out r202580.
@@ -490,8 +490,6 @@ - (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
[_scrollView setInternalDelegate:self];
[_scrollView setBouncesZoom:YES];

[self _setIsBlankBeforeFirstNonEmptyLayout:YES];

[self addSubview:_scrollView.get()];

static uint32_t programSDKVersion = dyld_get_program_sdk_version();
@@ -1752,12 +1750,6 @@ - (BOOL)_allowsDoubleTapGestures
return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
}

#if !USE(APPLE_INTERNAL_SDK)
- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
{
}
#endif

#pragma mark - UIScrollViewDelegate

- (BOOL)usesStandardContentView
@@ -2084,11 +2076,6 @@ - (void)_updateContentRectsWithState:(BOOL)inStableState
enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
}

- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
{
[self _setIsBlankBeforeFirstNonEmptyLayout:NO];
}

- (void)_didFinishLoadForMainFrame
{
if (_gestureController)
@@ -4632,8 +4619,12 @@ - (NSArray *)certificateChain

@end

#if USE(APPLE_INTERNAL_SDK)
#if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WKWebViewAdditions.mm>
#endif

#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WKWebViewAdditionsMac.mm>
#endif

#endif // WK_API_ENABLED
@@ -103,7 +103,6 @@ struct PrintInfo;
- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
- (void)_updateContentRectsWithState:(BOOL)inStableState;

- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
- (void)_didFinishLoadForMainFrame;
- (void)_didFailLoadForMainFrame;
- (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
@@ -118,8 +117,6 @@ struct PrintInfo;

- (void)_updateForceAlwaysUserScalable;

- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;

@property (nonatomic, readonly) BOOL _isBackground;

@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;
@@ -702,7 +702,6 @@ - (void)redoEditing:(id)sender

void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
{
[m_webView _didFirstVisuallyNonEmptyLayoutForMainFrame];
}

void PageClientImpl::didFinishLoadForMainFrame()

0 comments on commit 6f9dc77

Please sign in to comment.