Changeset 230497 in webkit

Timestamp:

Apr 10, 2018 3:35:46 PM (6 years ago)

Author:

aestes@apple.com

Message:

[iOS] Navigate to URL and page number annotations in WKPDFView
​https://bugs.webkit.org/show_bug.cgi?id=184410

Reviewed by Timothy Hatcher.

Implemented navigation to URL and page number (same-document) link annotations in PDFs.

• UIProcess/ios/WKPDFView.mm:

(-[WKPDFView _scrollToURLFragment:]):
(-[WKPDFView web_didSameDocumentNavigation:]):
(-[WKPDFView pdfHostViewController:updatePageCount:]):
(-[WKPDFView pdfHostViewController:goToURL:]):
(-[WKPDFView pdfHostViewController:goToPageIndex:withViewFrustum:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKPDFView.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-10  Andy Estes  <aestes@apple.com>
+
+        [iOS] Navigate to URL and page number annotations in WKPDFView
+        https://bugs.webkit.org/show_bug.cgi?id=184410
+
+        Reviewed by Timothy Hatcher.
+
+        Implemented navigation to URL and page number (same-document) link annotations in PDFs.
+
+        * UIProcess/ios/WKPDFView.mm:
+        (-[WKPDFView _scrollToURLFragment:]):
+        (-[WKPDFView web_didSameDocumentNavigation:]):
+        (-[WKPDFView pdfHostViewController:updatePageCount:]):
+        (-[WKPDFView pdfHostViewController:goToURL:]):
+        (-[WKPDFView pdfHostViewController:goToPageIndex:withViewFrustum:]):
+
 2018-04-10  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm

@@ -163 +163 @@
 }
 
+- (void)_scrollToURLFragment:(NSString *)fragment
+{
+    NSInteger pageIndex = 0;
+    if ([fragment hasPrefix:@"page"])
+        pageIndex = [[fragment substringFromIndex:4] integerValue] - 1;
+
+    if (pageIndex >= 0 && pageIndex < [_hostViewController pageCount] && pageIndex != [_hostViewController currentPageIndex])
+        [_hostViewController goToPageIndex:pageIndex];
+}
+
 - (void)web_didSameDocumentNavigation:(WKSameDocumentNavigationType)navigationType
 {
-    // FIXME: Implement page number navigations.
+    if (navigationType == kWKSameDocumentNavigationSessionStatePop)
+        [self _scrollToURLFragment:[_webView URL].fragment];
 }
 
@@ -221 +232 @@
 {
     return self.isBackground;
+}
+
+#pragma mark PDFHostViewControllerDelegate
+
+- (void)pdfHostViewController:(PDFHostViewController *)controller updatePageCount:(NSInteger)pageCount
+{
+    [self _scrollToURLFragment:[_webView URL].fragment];
+}
+
+- (void)pdfHostViewController:(PDFHostViewController *)controller goToURL:(NSURL *)url
+{
+    WKWebView *webView = _webView.getAutoreleased();
+    if (!webView)
+        return;
+
+    // FIXME: We'd use the real tap location if we knew it.
+    WebCore::IntPoint point;
+    webView->_page->navigateToPDFLinkWithSimulatedClick(url.absoluteString, point, point);
+}
+
+- (void)pdfHostViewController:(PDFHostViewController *)controller goToPageIndex:(NSInteger)pageIndex withViewFrustum:(CGRect)documentViewRect
+{
+    WKWebView *webView = _webView.getAutoreleased();
+    if (!webView)
+        return;
+
+    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"#page%ld", (long)pageIndex + 1] relativeToURL:webView.URL];
+    CGPoint documentPoint = documentViewRect.origin;
+    CGPoint screenPoint = [self.window convertPoint:[self convertPoint:documentPoint toView:nil] toWindow:nil];
+    webView->_page->navigateToPDFLinkWithSimulatedClick(url.absoluteString, WebCore::roundedIntPoint(documentPoint), WebCore::roundedIntPoint(screenPoint));
 }