Title: [202612] trunk/Source/WebKit2
- Revision
- 202612
- Author
- [email protected]
- Date
- 2016-06-28 22:04:28 -0700 (Tue, 28 Jun 2016)
Log Message
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 <[email protected]> on 2016-06-28
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202611 => 202612)
--- trunk/Source/WebKit2/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 05:04:28 UTC (rev 202612)
@@ -1,5 +1,23 @@
2016-06-28 Commit Queue <[email protected]>
+ 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 <[email protected]>
+
Unreviewed, rolling out r202580.
https://bugs.webkit.org/show_bug.cgi?id=159245
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202611 => 202612)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 05:04:28 UTC (rev 202612)
@@ -490,8 +490,6 @@
[_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 @@
return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
}
-#if !USE(APPLE_INTERNAL_SDK)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-#endif
-
#pragma mark - UIScrollViewDelegate
- (BOOL)usesStandardContentView
@@ -2084,11 +2076,6 @@
enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
}
-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
-{
- [self _setIsBlankBeforeFirstNonEmptyLayout:NO];
-}
-
- (void)_didFinishLoadForMainFrame
{
if (_gestureController)
@@ -4632,8 +4619,12 @@
@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
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (202611 => 202612)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 05:04:28 UTC (rev 202612)
@@ -103,7 +103,6 @@
- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
- (void)_updateContentRectsWithState:(BOOL)inStableState;
-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
- (void)_didFinishLoadForMainFrame;
- (void)_didFailLoadForMainFrame;
- (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
@@ -118,8 +117,6 @@
- (void)_updateForceAlwaysUserScalable;
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;
-
@property (nonatomic, readonly) BOOL _isBackground;
@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (202611 => 202612)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-06-29 05:04:28 UTC (rev 202612)
@@ -702,7 +702,6 @@
void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
{
- [m_webView _didFirstVisuallyNonEmptyLayoutForMainFrame];
}
void PageClientImpl::didFinishLoadForMainFrame()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
