Changeset 175608 in webkit

Timestamp:

Nov 4, 2014 9:36:08 PM (9 years ago)

Author:

aestes@apple.com

Message:

[iOS] WKPDFView should scroll to a fragment when loading a PDF
​https://bugs.webkit.org/show_bug.cgi?id=138404

Reviewed by Tim Horton.

WKPDFView already knew how to scroll to a page number fragment during a same-document navigation, but it didn't
know to do so when loading a PDF whose URL already contained a page number fragment. This could happen if the
user long-presses a page number link and taps 'Open in New Tab'.

• UIProcess/ios/WKPDFView.mm:

(-[WKPDFView web_setContentProviderData:suggestedFilename:]): Called _scrollToFragment:.
(-[WKPDFView _scrollToFragment:]): Moved fragment scrolling code to here from web_didSameDocumentNavigation:.
(-[WKPDFView web_didSameDocumentNavigation:]): Called _scrollToFragment.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-04  Andy Estes  <aestes@apple.com>
+
+        [iOS] WKPDFView should scroll to a fragment when loading a PDF
+        https://bugs.webkit.org/show_bug.cgi?id=138404
+
+        Reviewed by Tim Horton.
+
+        WKPDFView already knew how to scroll to a page number fragment during a same-document navigation, but it didn't
+        know to do so when loading a PDF whose URL already contained a page number fragment. This could happen if the
+        user long-presses a page number link and taps 'Open in New Tab'.
+
+        * UIProcess/ios/WKPDFView.mm:
+        (-[WKPDFView web_setContentProviderData:suggestedFilename:]): Called _scrollToFragment:.
+        (-[WKPDFView _scrollToFragment:]): Moved fragment scrolling code to here from web_didSameDocumentNavigation:.
+        (-[WKPDFView web_didSameDocumentNavigation:]): Called _scrollToFragment.
+
 2014-11-04  Andy Estes  <aestes@apple.com>
 

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

@@ -148 +148 @@
     [self _computePageAndDocumentFrames];
     [self _revalidateViews];
+    [self _scrollToFragment:_webView.URL.fragment];
 }
 
@@ -251 +252 @@
 }
 
+- (void)_scrollToFragment:(NSString *)fragment
+{
+    if (![fragment hasPrefix:@"page"])
+        return;
+
+    NSInteger pageIndex = [[fragment substringFromIndex:4] integerValue] - 1;
+    if (pageIndex < 0 || static_cast<std::size_t>(pageIndex) >= _pages.size())
+        return;
+
+    _isPerformingSameDocumentNavigation = YES;
+
+    [_pageNumberIndicator hide];
+    [self _resetZoomAnimated:NO];
+
+    // Ensure that the page margin is visible below the content inset.
+    const CGFloat verticalOffset = _pages[pageIndex].frame.origin.y - _webView._computedContentInset.top - pdfPageMargin;
+    [_scrollView setContentOffset:CGPointMake(_scrollView.contentOffset.x, verticalOffset) animated:NO];
+
+    _isPerformingSameDocumentNavigation = NO;
+}
+
 - (void)web_didSameDocumentNavigation:(WKSameDocumentNavigationType)navigationType
 {
@@ -261 +283 @@
     // FIXME: restore the scroll position and page scale if navigating back from a fragment.
 
-    NSString *fragment = _webView.URL.fragment;
-    if (![fragment hasPrefix:@"page"])
-        return;
-
-    NSInteger pageIndex = [[fragment substringFromIndex:4] integerValue] - 1;
-    if (pageIndex < 0 || static_cast<std::size_t>(pageIndex) >= _pages.size())
-        return;
-
-    _isPerformingSameDocumentNavigation = YES;
-
-    [_pageNumberIndicator hide];
-    [self _resetZoomAnimated:NO];
-
-    // Ensure that the page margin is visible below the content inset.
-    const CGFloat verticalOffset = _pages[pageIndex].frame.origin.y - _webView._computedContentInset.top - pdfPageMargin;
-    [_scrollView setContentOffset:CGPointMake(_scrollView.contentOffset.x, verticalOffset) animated:NO];
-
-    _isPerformingSameDocumentNavigation = NO;
+    [self _scrollToFragment:_webView.URL.fragment];
 }