Skip to content

Commit

Permalink
Unreviewed, fix iOS build with recent SDKs.
Browse files Browse the repository at this point in the history
Source/WebKit:

* UIProcess/API/Cocoa/WKWebView.mm:
(deviceOrientation):
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController initWithWebView:]):
(-[WKFullScreenViewController viewWillTransitionToSize:withTransitionCoordinator:]):
(-[WKFullScreenViewController _statusBarFrameDidChange:]):

Tools:

* TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:

Canonical link: https://commits.webkit.org/211359@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244484 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Apr 20, 2019
1 parent cc2feb9 commit 607dbb4
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
2019-04-20 Chris Dumez <cdumez@apple.com>

Unreviewed, fix iOS build with recent SDKs.

* UIProcess/API/Cocoa/WKWebView.mm:
(deviceOrientation):
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController initWithWebView:]):
(-[WKFullScreenViewController viewWillTransitionToSize:withTransitionCoordinator:]):
(-[WKFullScreenViewController _statusBarFrameDidChange:]):

2019-04-19 John Wilander <wilander@apple.com>

Disable Ad Click Attribution in ephemeral sessions and make sure conversion requests use an ephemeral, stateless session
Expand Down
2 changes: 2 additions & 0 deletions Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
Expand Up @@ -412,7 +412,9 @@ static int32_t deviceOrientationForUIInterfaceOrientation(UIInterfaceOrientation

static int32_t deviceOrientation()
{
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return deviceOrientationForUIInterfaceOrientation([[UIApplication sharedApplication] statusBarOrientation]);
ALLOW_DEPRECATED_DECLARATIONS_END
}

- (BOOL)_isShowingVideoPictureInPicture
Expand Down
Expand Up @@ -179,8 +179,10 @@ - (id)initWithWebView:(WKWebView *)webView
if (!self)
return nil;

ALLOW_DEPRECATED_DECLARATIONS_BEGIN
_nonZeroStatusBarHeight = UIApplication.sharedApplication.statusBarFrame.size.height;
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_statusBarFrameDidChange:) name:UIApplicationDidChangeStatusBarFrameNotification object:nil];
ALLOW_DEPRECATED_DECLARATIONS_END
_secheuristic.setRampUpSpeed(Seconds(0.25));
_secheuristic.setRampDownSpeed(Seconds(1.));
_secheuristic.setXWeight(0);
Expand Down Expand Up @@ -445,7 +447,9 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
[self._webView _beginAnimatedResizeWithUpdates:^{
[self._webView _overrideLayoutParametersWithMinimumLayoutSize:size maximumUnobscuredSizeOverride:size];
}];
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[self._webView _setInterfaceOrientationOverride:[UIApp statusBarOrientation]];
ALLOW_DEPRECATED_DECLARATIONS_END
} completion:^(id <UIViewControllerTransitionCoordinatorContext>context) {
[self._webView _endAnimatedResize];
}];
Expand Down Expand Up @@ -536,7 +540,9 @@ - (void)_touchDetected:(id)sender

- (void)_statusBarFrameDidChange:(NSNotificationCenter *)notification
{
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
CGFloat height = UIApplication.sharedApplication.statusBarFrame.size.height;
ALLOW_DEPRECATED_DECLARATIONS_END
if (!height || height == _nonZeroStatusBarHeight)
return;

Expand Down
6 changes: 6 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,9 @@
2019-04-20 Chris Dumez <cdumez@apple.com>

Unreviewed, fix iOS build with recent SDKs.

* TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:

2019-04-19 Keith Miller <keith_miller@apple.com>

Add script to merge run_benchmark jsons
Expand Down
4 changes: 4 additions & 0 deletions Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm
Expand Up @@ -285,10 +285,14 @@ @interface DragAndDropSimulatorApplication : UIApplication
@end

@implementation DragAndDropSimulatorApplication

IGNORE_WARNINGS_BEGIN("deprecated-implementations")
- (void)_cancelAllTouches
{
[[NSNotificationCenter defaultCenter] postNotificationName:TestWebKitAPISimulateCancelAllTouchesNotificationName object:nil];
}
IGNORE_WARNINGS_END

@end

@implementation DragAndDropSimulator {
Expand Down

0 comments on commit 607dbb4

Please sign in to comment.