Changeset 202605 in webkit

Timestamp:

Jun 28, 2016 8:53:16 PM (8 years ago)

Author:

commit-queue@webkit.org

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (4 diffs)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-28  Commit Queue  <commit-queue@webkit.org>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -162 +162 @@
 #endif
 
-#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>
-
 #if PLATFORM(MAC)
 #import "WKTextFinderClient.h"
@@ -388 +386 @@
 #endif
 
-#if !USE(APPLE_INTERNAL_SDK)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-#endif
-
 - (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
 {
@@ -1760 +1752 @@
     return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
 }
+
+#if !USE(APPLE_INTERNAL_SDK)
+- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
+{
+}
+#endif
 
 #pragma mark - UIScrollViewDelegate
@@ -4636 +4634 @@
 
 #if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditionsAfter.mm>
+#import <WebKitAdditions/WKWebViewAdditions.mm>
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

@@ -119 +119 @@
 - (void)_updateForceAlwaysUserScalable;
 
+- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;
+
 @property (nonatomic, readonly) BOOL _isBackground;