Try to fix the build.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jun 2016 23:07:07 +0000 (23:07 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jun 2016 23:07:07 +0000 (23:07 +0000)
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/Cocoa/WKWebViewInternal.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

index 7c58ba3..1b580ed 100644 (file)
@@ -1,5 +1,12 @@
 2016-06-28  Tim Horton  <timothy_horton@apple.com>
 
+        Try to fix the build.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+
+2016-06-28  Tim Horton  <timothy_horton@apple.com>
+
         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>
index cf8fa2f..ef37503 100644 (file)
@@ -157,10 +157,6 @@ enum class DynamicViewportUpdateMode {
 
 #endif // PLATFORM(IOS)
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewAdditions.mm>
-#endif
-
 #if PLATFORM(IOS)
 static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
 #endif
@@ -4636,4 +4632,8 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISe
 
 @end
 
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewAdditions.mm>
+#endif
+
 #endif // WK_API_ENABLED
index bc6af7d..b753d1d 100644 (file)
@@ -118,6 +118,8 @@ struct PrintInfo;
 
 - (void)_updateForceAlwaysUserScalable;
 
+- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;
+
 @property (nonatomic, readonly) BOOL _isBackground;
 
 @property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;