Title: [207611] branches/safari-602-branch/Source/WebKit2
- Revision
- 207611
- Author
- matthew_han...@apple.com
- Date
- 2016-10-20 04:12:22 -0700 (Thu, 20 Oct 2016)
Log Message
Merge r206413. rdar://problem/28744171
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207610 => 207611)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 11:12:18 UTC (rev 207610)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 11:12:22 UTC (rev 207611)
@@ -1,3 +1,24 @@
+2016-10-20 Matthew Hanson <matthew_hanson>
+
+ Merge r206413. rdar://problem/28744171
+
+ 2016-09-26 Tim Horton <timothy_hor...@apple.com>
+
+ Delete some unused code from r202695
+ https://bugs.webkit.org/show_bug.cgi?id=162595
+ <rdar://problem/28343784>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ (-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]): Deleted.
+ (-[WKWebView _didFirstVisuallyNonEmptyLayoutForMainFrame]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame):
+ We didn't end up needing this mechanism.
+
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
Merge r204637. rdar://problem/28216256
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207610 => 207611)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-20 11:12:18 UTC (rev 207610)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-20 11:12:22 UTC (rev 207611)
@@ -162,16 +162,6 @@
static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
#endif
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>
-#else
-@implementation WKWebView (Additions)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-@end
-#endif
-
#if PLATFORM(MAC)
#import "WKTextFinderClient.h"
#import "WKViewInternal.h"
@@ -492,8 +482,6 @@
[_scrollView setInternalDelegate:self];
[_scrollView setBouncesZoom:YES];
- [self _setIsBlankBeforeFirstNonEmptyLayout:YES];
-
[self addSubview:_scrollView.get()];
static uint32_t programSDKVersion = dyld_get_program_sdk_version();
@@ -2090,11 +2078,6 @@
enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
}
-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
-{
- [self _setIsBlankBeforeFirstNonEmptyLayout:NO];
-}
-
- (void)_didFinishLoadForMainFrame
{
if (_gestureController)
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (207610 => 207611)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-10-20 11:12:18 UTC (rev 207610)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-10-20 11:12:22 UTC (rev 207611)
@@ -103,7 +103,6 @@
- (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
- (void)_updateContentRectsWithState:(BOOL)inStableState;
-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
- (void)_didFinishLoadForMainFrame;
- (void)_didFailLoadForMainFrame;
- (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (207610 => 207611)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-10-20 11:12:18 UTC (rev 207610)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-10-20 11:12:22 UTC (rev 207611)
@@ -702,7 +702,6 @@
void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
{
- [m_webView _didFirstVisuallyNonEmptyLayoutForMainFrame];
}
void PageClientImpl::didFinishLoadForMainFrame()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
