Skip to content
Permalink
Browse files
* UIProcess/API/Cocoa/WKWebView.mm:
(convertSystemLayoutDirection):
(-[WKWebView _setIsBlankBeforeFirstNonEmptyLayout:]):
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewInternal.h:


Canonical link: https://commits.webkit.org/177345@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202598 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
hortont424 committed Jun 29, 2016
1 parent 921b120 commit f728182dd37cd2d6df4fae9f9a4187a8af881fba
Showing with 19 additions and 9 deletions.
  1. +10 −0 Source/WebKit2/ChangeLog
  2. +9 −7 Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
  3. +0 −2 Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
@@ -1,3 +1,13 @@
2016-06-28 Tim Horton <timothy_horton@apple.com>

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 <timothy_horton@apple.com>

Try to fix the build.
@@ -161,6 +161,8 @@ - (UIViewController *)_viewControllerForSupportedInterfaceOrientations;
static const uint32_t firstSDKVersionWithLinkPreviewEnabledByDefault = 0xA0000;
#endif

#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>

#if PLATFORM(MAC)
#import "WKTextFinderClient.h"
#import "WKViewInternal.h"
@@ -385,6 +387,12 @@ static uint32_t convertSystemLayoutDirection(NSUserInterfaceLayoutDirection dire
}
#endif

#if !USE(APPLE_INTERNAL_SDK)
- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
{
}
#endif

- (void)_initializeWithConfiguration:(WKWebViewConfiguration *)configuration
{
if (!configuration)
@@ -1752,12 +1760,6 @@ - (BOOL)_allowsDoubleTapGestures
return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
}

#if !USE(APPLE_INTERNAL_SDK)
- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
{
}
#endif

#pragma mark - UIScrollViewDelegate

- (BOOL)usesStandardContentView
@@ -4633,7 +4635,7 @@ - (NSArray *)certificateChain
@end

#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WKWebViewAdditions.mm>
#import <WebKitAdditions/WKWebViewAdditionsAfter.mm>
#endif

#endif // WK_API_ENABLED
@@ -118,8 +118,6 @@ struct PrintInfo;

- (void)_updateForceAlwaysUserScalable;

- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;

@property (nonatomic, readonly) BOOL _isBackground;

@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;

0 comments on commit f728182

Please sign in to comment.