Title: [248613] branches/safari-608-branch
- Revision
- 248613
- Author
- [email protected]
- Date
- 2019-08-13 13:00:50 -0700 (Tue, 13 Aug 2019)
Log Message
Cherry-pick r248281. rdar://problem/54237787
iOS 13: Overflow:hidden on body prevents PDF scroll
https://bugs.webkit.org/show_bug.cgi?id=200435
rdar://problem/53942888
Reviewed by Tim Horton.
Source/WebKit:
When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
to make sure that the scroll view is scrollable.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
Tools:
When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
to make sure that the scroll view is scrollable.
* TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm:
(TestWebKitAPI::TEST):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248281 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (248612 => 248613)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-13 20:00:47 UTC (rev 248612)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-13 20:00:50 UTC (rev 248613)
@@ -1,5 +1,47 @@
2019-08-13 Alan Coon <[email protected]>
+ Cherry-pick r248281. rdar://problem/54237787
+
+ iOS 13: Overflow:hidden on body prevents PDF scroll
+ https://bugs.webkit.org/show_bug.cgi?id=200435
+ rdar://problem/53942888
+
+ Reviewed by Tim Horton.
+ Source/WebKit:
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+
+ Tools:
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm:
+ (TestWebKitAPI::TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248281 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-05 Simon Fraser <[email protected]>
+
+ iOS 13: Overflow:hidden on body prevents PDF scroll
+ https://bugs.webkit.org/show_bug.cgi?id=200435
+ rdar://problem/53942888
+
+ Reviewed by Tim Horton.
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+
+2019-08-13 Alan Coon <[email protected]>
+
Cherry-pick r248174. rdar://problem/54237758
[iPadOS] slides.google.com: Full Screen API warning is presented when swiping through slides
Modified: branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (248612 => 248613)
--- branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-08-13 20:00:47 UTC (rev 248612)
+++ branches/safari-608-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-08-13 20:00:50 UTC (rev 248613)
@@ -1631,6 +1631,7 @@
_scrollViewBackgroundColor = WebCore::Color();
[_scrollView setContentOffset:[self _initialContentOffsetForScrollView]];
+ [_scrollView _setScrollEnabledInternal:YES];
[self _setAvoidsUnsafeArea:NO];
} else if (_customContentView) {
Modified: branches/safari-608-branch/Tools/ChangeLog (248612 => 248613)
--- branches/safari-608-branch/Tools/ChangeLog 2019-08-13 20:00:47 UTC (rev 248612)
+++ branches/safari-608-branch/Tools/ChangeLog 2019-08-13 20:00:50 UTC (rev 248613)
@@ -1,5 +1,47 @@
2019-08-13 Alan Coon <[email protected]>
+ Cherry-pick r248281. rdar://problem/54237787
+
+ iOS 13: Overflow:hidden on body prevents PDF scroll
+ https://bugs.webkit.org/show_bug.cgi?id=200435
+ rdar://problem/53942888
+
+ Reviewed by Tim Horton.
+ Source/WebKit:
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:]):
+
+ Tools:
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm:
+ (TestWebKitAPI::TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@248281 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-08-05 Simon Fraser <[email protected]>
+
+ iOS 13: Overflow:hidden on body prevents PDF scroll
+ https://bugs.webkit.org/show_bug.cgi?id=200435
+ rdar://problem/53942888
+
+ Reviewed by Tim Horton.
+
+ When we navigate from an overflow:hidden HTML page to a custom view (like PDF), we need
+ to make sure that the scroll view is scrollable.
+
+ * TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm:
+ (TestWebKitAPI::TEST):
+
+2019-08-13 Alan Coon <[email protected]>
+
Cherry-pick r248169. rdar://problem/54237663
Add accessibility object method to determine whether an element is inside a table cell. Needed for iOS accessibility client.
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm (248612 => 248613)
--- branches/safari-608-branch/Tools/TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm 2019-08-13 20:00:47 UTC (rev 248612)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/Tests/ios/ScrollViewScrollabilityTests.mm 2019-08-13 20:00:50 UTC (rev 248613)
@@ -29,6 +29,7 @@
#import "PlatformUtilities.h"
#import "TestInputDelegate.h"
+#import "TestNavigationDelegate.h"
#import "TestWKWebView.h"
#import <UIKit/UIKit.h>
#import <WebKit/WKWebViewPrivate.h>
@@ -137,6 +138,22 @@
EXPECT_EQ([[webView scrollView] isScrollEnabled], YES);
}
+TEST(ScrollViewScrollabilityTests, ScrollableAfterNavigateToPDF)
+{
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, viewHeight, 414)]);
+
+ [webView synchronouslyLoadHTMLString:nonScrollableDocumentMarkup];
+ [webView waitForNextPresentationUpdate];
+ EXPECT_EQ([[webView scrollView] isScrollEnabled], NO);
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"test" withExtension:@"pdf" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView loadRequest:request];
+
+ [webView _test_waitForDidFinishNavigation];
+
+ EXPECT_EQ([[webView scrollView] isScrollEnabled], YES);
+}
+
} // namespace TestWebKitAPI
#endif // PLATFORM(IOS_FAMILY)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
