Title: [202605] trunk/Source/WebKit2
- Revision
- 202605
- Author
- [email protected]
- Date
- 2016-06-28 20:53:16 -0700 (Tue, 28 Jun 2016)
Log Message
Unreviewed, rolling out r202598.
https://bugs.webkit.org/show_bug.cgi?id=159244
broke the build. (Requested by keith_miller on #webkit).
Reverted changeset:
"Try to fix the build."
http://trac.webkit.org/changeset/202598
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202604 => 202605)
--- trunk/Source/WebKit2/ChangeLog 2016-06-29 02:26:54 UTC (rev 202604)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 03:53:16 UTC (rev 202605)
@@ -1,3 +1,15 @@
+2016-06-28 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r202598.
+ https://bugs.webkit.org/show_bug.cgi?id=159244
+
+ broke the build. (Requested by keith_miller on #webkit).
+
+ Reverted changeset:
+
+ "Try to fix the build."
+ http://trac.webkit.org/changeset/202598
+
2016-06-28 Tim Horton <[email protected]>
Try to fix the build.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202604 => 202605)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 02:26:54 UTC (rev 202604)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 03:53:16 UTC (rev 202605)
@@ -161,8 +161,6 @@
static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
#endif
-#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>
-
#if PLATFORM(MAC)
#import "WKTextFinderClient.h"
#import "WKViewInternal.h"
@@ -387,12 +385,6 @@
}
#endif
-#if !USE(APPLE_INTERNAL_SDK)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-#endif
-
- (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
{
if (!configuration)
@@ -1760,6 +1752,12 @@
return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
}
+#if !USE(APPLE_INTERNAL_SDK)
+- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
+{
+}
+#endif
+
#pragma mark - UIScrollViewDelegate
- (BOOL)usesStandardContentView
@@ -4635,7 +4633,7 @@
@end
#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditionsAfter.mm>
+#import <WebKitAdditions/WKWebViewAdditions.mm>
#endif
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (202604 => 202605)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 02:26:54 UTC (rev 202604)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 03:53:16 UTC (rev 202605)
@@ -118,6 +118,8 @@
- (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
