Skip to content
Permalink
Browse files
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

Canonical link: https://commits.webkit.org/177352@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jun 29, 2016
1 parent 7884cbe commit 26577aff12df4ee037b7a07f16f9dd384658d725
Showing with 21 additions and 9 deletions.
  1. +12 −0 Source/WebKit2/ChangeLog
  2. +7 −9 Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
  3. +2 −0 Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
@@ -1,3 +1,15 @@
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>

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

#import <WebKitAdditions/WKWebViewAdditionsBefore.mm>

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

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

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

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

#pragma mark - UIScrollViewDelegate

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

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

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

- (void)_updateForceAlwaysUserScalable;

- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;

@property (nonatomic, readonly) BOOL _isBackground;

@property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;

0 comments on commit 26577af

Please sign in to comment.