Title: [202598] trunk/Source/WebKit2
- Revision
- 202598
- Author
- [email protected]
- Date
- 2016-06-28 17:47:35 -0700 (Tue, 28 Jun 2016)
Log Message
* UIProcess/API/Cocoa/WKWebView.mm:
(convertSystemLayoutDirection):
(-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]):
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202597 => 202598)
--- trunk/Source/WebKit2/ChangeLog 2016-06-29 00:38:58 UTC (rev 202597)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 00:47:35 UTC (rev 202598)
@@ -3,10 +3,20 @@
Try to fix the build.
* UIProcess/API/Cocoa/WKWebView.mm:
+ (convertSystemLayoutDirection):
+ (-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]):
+ (-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:
2016-06-28 Tim Horton <[email protected]>
+ Try to fix the build.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+
+2016-06-28 Tim Horton <[email protected]>
+
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>
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202597 => 202598)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 00:38:58 UTC (rev 202597)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 00:47:35 UTC (rev 202598)
@@ -161,6 +161,8 @@
static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
#endif
+#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>
+
#if PLATFORM(MAC)
#import "WKTextFinderClient.h"
#import "WKViewInternal.h"
@@ -385,6 +387,12 @@
}
#endif
+#if !USE(APPLE_INTERNAL_SDK)
+- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
+{
+}
+#endif
+
- (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
{
if (!configuration)
@@ -1752,12 +1760,6 @@
return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
}
-#if !USE(APPLE_INTERNAL_SDK)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-#endif
-
#pragma mark - UIScrollViewDelegate
- (BOOL)usesStandardContentView
@@ -4633,7 +4635,7 @@
@end
#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditions.mm>
+#import <WebKitAdditions/WKWebViewAdditionsAfter.mm>
#endif
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (202597 => 202598)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 00:38:58 UTC (rev 202597)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 00:47:35 UTC (rev 202598)
@@ -118,8 +118,6 @@
- (void)_updateForceAlwaysUserScalable;
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;
-
@property (nonatomic, readonly) BOOL _isBackground;
@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
