<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169290] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169290">169290</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-05-23 16:52:12 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WKPDFView should have a page indicator
https://bugs.webkit.org/show_bug.cgi?id=133109
<rdar://problem/16383003>
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
(-[WKWebView _setObscuredInsets:]):
Forward obscured insets changes to the custom content view.
(-[WKWebView _updateScrollViewBackground]):
If we have a custom content view, use its background instead of the
(likely nonexistent) page's when updaing the scroll view's background color.
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/Cocoa/WKWebViewContentProvider.h:
* UIProcess/Cocoa/WKWebViewContentProviderDelegate.h: Added.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setInsetForOverlaidAccessoryViews:]):
Add SPI for clients to inform us about potential overlaid accessory views
which should be taken into account e.g. for positioning the page indicator.
Add a view that sits fixed on top of the WKWebView, ignores interaction,
but provides the WKWebViewContentProvider a place to install views
that don't scroll along with the content.
* UIProcess/ios/WKPDFPageNumberIndicator.h: Added.
* UIProcess/ios/WKPDFPageNumberIndicator.mm: Added.
(-[WKPDFPageNumberIndicator initWithFrame:]):
(-[WKPDFPageNumberIndicator dealloc]):
(-[WKPDFPageNumberIndicator setCurrentPageNumber:]):
(-[WKPDFPageNumberIndicator setPageCount:]):
(-[WKPDFPageNumberIndicator show]):
(-[WKPDFPageNumberIndicator hide:]):
(-[WKPDFPageNumberIndicator moveToPoint:animated:]):
(-[WKPDFPageNumberIndicator sizeThatFits:]):
(-[WKPDFPageNumberIndicator _updateLabel]):
(-[WKPDFPageNumberIndicator _makeRoundedCorners]):
Add a page number indicator.
* UIProcess/ios/WKPDFView.mm:
(-[WKPDFView dealloc]):
(-[WKPDFView web_setScrollView:]):
(-[WKPDFView _revalidateViews]):
(-[WKPDFView _offsetForPageNumberIndicator]):
(-[WKPDFView _updatePageNumberIndicator]):
(-[WKPDFView web_setObscuredInsets:]):
(-[WKPDFView web_setInsetForOverlaidAccessoryViews:]):
(-[WKPDFView web_setFixedOverlayView:]):
(-[WKPDFView _computePageAndDocumentFrames]):
Update the page number indicator when the topmost visible page changes.
Move the page number indicator around when the obscured insets change.
* WebKit2.xcodeproj/project.pbxproj:
* English.lproj/Localizable.strings:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWKWebViewContentProviderh">trunk/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKPDFViewmm">trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatorh">trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatormm">trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-23 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] WKPDFView should have a page indicator
+ https://bugs.webkit.org/show_bug.cgi?id=133109
+ <rdar://problem/16383003>
+
+ Reviewed by Anders Carlsson.
+
+ * English.lproj/Localizable.strings:
+
</ins><span class="cx"> 2014-05-23 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove invalid ASSERT in wordRangeForPosition.
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> /* Visible name of the web process. The argument is the application name. */
</span><span class="cx"> "%@ Web Content" = "%@ Web Content";
</span><span class="cx">
</span><ins>+/* Label for PDF page number indicator. The arguments are the current page number and total page count (iOS only) */
+"%d of %d" = "%d of %d";
+
</ins><span class="cx"> /* Name of application's single WebCrypto master key in Keychain */
</span><span class="cx"> "%@ WebCrypto Master Key" = "%@ WebCrypto Master Key";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2014-05-23 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] WKPDFView should have a page indicator
+ https://bugs.webkit.org/show_bug.cgi?id=133109
+ <rdar://problem/16383003>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
+ (-[WKWebView _setObscuredInsets:]):
+ Forward obscured insets changes to the custom content view.
+
+ (-[WKWebView _updateScrollViewBackground]):
+ If we have a custom content view, use its background instead of the
+ (likely nonexistent) page's when updaing the scroll view's background color.
+
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/WKWebViewContentProvider.h:
+ * UIProcess/Cocoa/WKWebViewContentProviderDelegate.h: Added.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setInsetForOverlaidAccessoryViews:]):
+ Add SPI for clients to inform us about potential overlaid accessory views
+ which should be taken into account e.g. for positioning the page indicator.
+
+ Add a view that sits fixed on top of the WKWebView, ignores interaction,
+ but provides the WKWebViewContentProvider a place to install views
+ that don't scroll along with the content.
+
+ * UIProcess/ios/WKPDFPageNumberIndicator.h: Added.
+ * UIProcess/ios/WKPDFPageNumberIndicator.mm: Added.
+ (-[WKPDFPageNumberIndicator initWithFrame:]):
+ (-[WKPDFPageNumberIndicator dealloc]):
+ (-[WKPDFPageNumberIndicator setCurrentPageNumber:]):
+ (-[WKPDFPageNumberIndicator setPageCount:]):
+ (-[WKPDFPageNumberIndicator show]):
+ (-[WKPDFPageNumberIndicator hide:]):
+ (-[WKPDFPageNumberIndicator moveToPoint:animated:]):
+ (-[WKPDFPageNumberIndicator sizeThatFits:]):
+ (-[WKPDFPageNumberIndicator _updateLabel]):
+ (-[WKPDFPageNumberIndicator _makeRoundedCorners]):
+ Add a page number indicator.
+
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView dealloc]):
+ (-[WKPDFView web_setScrollView:]):
+ (-[WKPDFView _revalidateViews]):
+ (-[WKPDFView _offsetForPageNumberIndicator]):
+ (-[WKPDFView _updatePageNumberIndicator]):
+ (-[WKPDFView web_setObscuredInsets:]):
+ (-[WKPDFView web_setInsetForOverlaidAccessoryViews:]):
+ (-[WKPDFView web_setFixedOverlayView:]):
+ (-[WKPDFView _computePageAndDocumentFrames]):
+ Update the page number indicator when the topmost visible page changes.
+ Move the page number indicator around when the obscured insets change.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-05-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix test failures on the bot.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> BOOL _allowsBackForwardNavigationGestures;
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIView <WKWebViewContentProvider>> _customContentView;
</span><ins>+ RetainPtr<UIView> _customContentFixedOverlayView;
</ins><span class="cx">
</span><span class="cx"> WebCore::Color _scrollViewBackgroundColor;
</span><span class="cx">
</span><span class="lines">@@ -429,6 +430,7 @@
</span><span class="cx"> {
</span><span class="cx"> CGRect oldBounds = self.bounds;
</span><span class="cx"> [super setBounds:bounds];
</span><ins>+ [_customContentFixedOverlayView setFrame:self.bounds];
</ins><span class="cx">
</span><span class="cx"> if (!CGSizeEqualToSize(oldBounds.size, bounds.size))
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><span class="lines">@@ -448,22 +450,34 @@
</span><span class="cx"> {
</span><span class="cx"> if (pageHasCustomContentView) {
</span><span class="cx"> [_customContentView removeFromSuperview];
</span><ins>+ [_customContentFixedOverlayView removeFromSuperview];
</ins><span class="cx">
</span><span class="cx"> Class representationClass = [[_configuration _contentProviderRegistry] providerForMIMEType:mimeType];
</span><span class="cx"> ASSERT(representationClass);
</span><span class="cx"> _customContentView = adoptNS([[representationClass alloc] init]);
</span><ins>+ _customContentFixedOverlayView = adoptNS([[UIView alloc] initWithFrame:self.bounds]);
+ [_customContentFixedOverlayView setUserInteractionEnabled:NO];
</ins><span class="cx">
</span><span class="cx"> [_contentView removeFromSuperview];
</span><span class="cx"> [_scrollView addSubview:_customContentView.get()];
</span><ins>+ [self addSubview:_customContentFixedOverlayView.get()];
</ins><span class="cx">
</span><span class="cx"> [_customContentView web_setMinimumSize:self.bounds.size];
</span><span class="cx"> [_customContentView web_setScrollView:_scrollView.get()];
</span><ins>+ [_customContentView web_setObscuredInsets:_obscuredInsets];
+ [_customContentView web_setFixedOverlayView:_customContentFixedOverlayView.get()];
</ins><span class="cx"> } else if (_customContentView) {
</span><span class="cx"> [_customContentView removeFromSuperview];
</span><span class="cx"> _customContentView = nullptr;
</span><span class="cx">
</span><ins>+ [_customContentFixedOverlayView removeFromSuperview];
+ _customContentFixedOverlayView = nullptr;
+
</ins><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><span class="cx"> [_scrollView setContentSize:[_contentView frame].size];
</span><ins>+
+ [_customContentFixedOverlayView setFrame:self.bounds];
+ [self addSubview:_customContentFixedOverlayView.get()];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -507,7 +521,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateScrollViewBackground
</span><span class="cx"> {
</span><del>- WebCore::Color color = _page->pageExtendedBackgroundColor();
</del><ins>+ WebCore::Color color;
+ if (_customContentView)
+ color = [_customContentView backgroundColor].CGColor;
+ else
+ color = _page->pageExtendedBackgroundColor();
</ins><span class="cx"> CGFloat zoomScale = contentZoomScale(self);
</span><span class="cx"> CGFloat minimumZoomScale = [_scrollView minimumZoomScale];
</span><span class="cx"> if (zoomScale < minimumZoomScale) {
</span><span class="lines">@@ -1578,6 +1596,7 @@
</span><span class="cx"> _obscuredInsets = obscuredInsets;
</span><span class="cx">
</span><span class="cx"> [self _updateVisibleContentRects];
</span><ins>+ [_customContentView web_setObscuredInsets:obscuredInsets];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (CGSize)_maximumUnobscuredSizeOverride
</span><span class="lines">@@ -1752,6 +1771,11 @@
</span><span class="cx"> [_contentView setShowingInspectorIndication:NO];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setOverlaidAccessoryViewsInset:(CGSize)inset
+{
+ [_customContentView web_setOverlaidAccessoryViewsInset:inset];
+}
+
</ins><span class="cx"> - (void)_snapshotRect:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler
</span><span class="cx"> {
</span><span class="cx"> CGRect snapshotRectInContentCoordinates = [self convertRect:rectInViewCoordinates toView:_contentView.get()];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -134,6 +134,8 @@
</span><span class="cx">
</span><span class="cx"> - (UIView *)_viewForFindUI;
</span><span class="cx">
</span><ins>+- (void)_setOverlaidAccessoryViewsInset:(CGSize)inset;
+
</ins><span class="cx"> // FIXME: Remove this once nobody uses it.
</span><span class="cx"> @property (nonatomic, readonly) NSURL *activeURL;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWKWebViewContentProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -31,9 +31,11 @@
</span><span class="cx">
</span><span class="cx"> @class NSData;
</span><span class="cx"> @class UIScrollView;
</span><ins>+@class UIView;
</ins><span class="cx"> @protocol NSObject;
</span><span class="cx"> @protocol UIScrollViewDelegate;
</span><span class="cx"> struct CGSize;
</span><ins>+struct UIEdgeInsets;
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should be API (and probably should not be a UIScrollViewDelegate).
</span><span class="cx"> @protocol WKWebViewContentProvider <NSObject, UIScrollViewDelegate>
</span><span class="lines">@@ -41,6 +43,9 @@
</span><span class="cx"> - (void)web_setContentProviderData:(NSData *)data suggestedFilename:(NSString *)filename;
</span><span class="cx"> - (void)web_setMinimumSize:(CGSize)size;
</span><span class="cx"> - (void)web_setScrollView:(UIScrollView *)scrollView;
</span><ins>+- (void)web_setObscuredInsets:(UIEdgeInsets)insets;
+- (void)web_setOverlaidAccessoryViewsInset:(CGSize)inset;
+- (void)web_setFixedOverlayView:(UIView *)fixedOverlayView;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatorh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.h (0 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.h 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if PLATFORM(IOS)
+
+#import <UIKit/UIView.h>
+
+@interface WKPDFPageNumberIndicator : UIView
+
+@property (nonatomic) unsigned currentPageNumber;
+@property (nonatomic) unsigned pageCount;
+
+- (void)moveToPoint:(CGPoint)point animated:(BOOL)animated;
+- (void)show;
+
+@end
+
+#endif // PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFPageNumberIndicatormm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm (0 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFPageNumberIndicator.mm 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -0,0 +1,208 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKPDFPageNumberIndicator.h"
+
+#if PLATFORM(IOS)
+
+#import <QuartzCore/CAFilter.h>
+#import <QuartzCore/CALayerPrivate.h>
+#import <UIKit/UIGeometry_Private.h>
+#import <UIKit/UIKit.h>
+#import <UIKit/UIView_Private.h>
+#import <UIKit/_UIBackdropView_Private.h>
+#import <WebCore/LocalizedStrings.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/text/WTFString.h>
+
+const CGFloat indicatorMargin = 20;
+const CGFloat indicatorVerticalPadding = 6;
+const CGFloat indicatorHorizontalPadding = 10;
+const CGFloat indicatorCornerRadius = 7;
+const CGFloat indicatorLabelOpacity = 0.4;
+const CGFloat indicatorFontSize = 16;
+
+const NSTimeInterval indicatorTimeout = 2;
+const NSTimeInterval indicatorFadeDuration = 0.5;
+const NSTimeInterval indicatorMoveDuration = 0.3;
+
+@implementation WKPDFPageNumberIndicator {
+ RetainPtr<UILabel> _label;
+ RetainPtr<_UIBackdropView> _backdropView;
+ RetainPtr<NSTimer> _timer;
+
+ bool _hasValidPageCountAndCurrentPage;
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
+
+ self.alpha = 0;
+ self.layer.allowsGroupOpacity = NO;
+ self.layer.allowsGroupBlending = NO;
+
+ _backdropView = adoptNS([[_UIBackdropView alloc] initWithPrivateStyle:_UIBackdropViewStyle_Light]);
+ [_backdropView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+ [self addSubview:_backdropView.get()];
+ [self _makeRoundedCorners];
+
+ _label = adoptNS([[UILabel alloc] initWithFrame:CGRectZero]);
+
+ [_label setOpaque:NO];
+ [_label setBackgroundColor:nil];
+ [_label setTextAlignment:NSTextAlignmentCenter];
+ [_label setFont:[UIFont boldSystemFontOfSize:indicatorFontSize]];
+ [_label setTextColor:[UIColor blackColor]];
+ [_label setAlpha:indicatorLabelOpacity];
+ [_label setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+ [[_label layer] setCompositingFilter:[CAFilter filterWithType:kCAFilterPlusD]];
+
+ [self addSubview:_label.get()];
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [_timer invalidate];
+ [super dealloc];
+}
+
+- (void)setCurrentPageNumber:(unsigned)currentPageNumber
+{
+ if (_currentPageNumber == currentPageNumber)
+ return;
+
+ _currentPageNumber = currentPageNumber;
+ [self _updateLabel];
+}
+
+- (void)setPageCount:(unsigned)pageCount
+{
+ if (_pageCount == pageCount)
+ return;
+
+ _pageCount = pageCount;
+ [self _updateLabel];
+}
+
+- (void)show
+{
+ self.alpha = 1;
+
+ if (_timer)
+ [_timer setFireDate:[NSDate dateWithTimeIntervalSinceNow:indicatorTimeout]];
+ else
+ _timer = [NSTimer scheduledTimerWithTimeInterval:indicatorTimeout target:self selector:@selector(hide:) userInfo:nil repeats:NO];
+}
+
+- (void)hide:(NSTimer *)timer
+{
+ [UIView animateWithDuration:indicatorFadeDuration animations:^{
+ self.alpha = 0;
+ }];
+
+ [_timer invalidate];
+ _timer = nullptr;
+}
+
+- (void)moveToPoint:(CGPoint)point animated:(BOOL)animated
+{
+ point.x += indicatorMargin;
+ point.y += indicatorMargin;
+
+ void (^animations)() = ^{
+ self.frameOrigin = point;
+ };
+ if (animated)
+ [UIView animateWithDuration:indicatorMoveDuration animations:animations];
+ else
+ animations();
+}
+
+- (CGSize)sizeThatFits:(CGSize)size
+{
+ CGSize labelSize = [_label sizeThatFits:[_label size]];
+ labelSize.width += 2 * indicatorHorizontalPadding;
+ labelSize.height += 2 * indicatorVerticalPadding;
+ return labelSize;
+}
+
+- (void)_updateLabel
+{
+ [_label setText:[NSString localizedStringWithFormat:WEB_UI_STRING("%d of %d", "Label for PDF page number indicator."), _currentPageNumber, _pageCount]];
+ [self sizeToFit];
+
+ if (!_pageCount || !_currentPageNumber)
+ return;
+
+ // We don't want to show the indicator when the PDF loads, but rather on the first subsequent change.
+ if (_hasValidPageCountAndCurrentPage)
+ [self show];
+ _hasValidPageCountAndCurrentPage = true;
+}
+
+- (void)_makeRoundedCorners
+{
+ CGSize cornerImageSize = CGSizeMake(2 * indicatorCornerRadius + 2, 2 * indicatorCornerRadius + 2);
+ CGRect cornerImageBounds = CGRectMake(0, 0, cornerImageSize.width, cornerImageSize.height);
+
+ UIGraphicsBeginImageContextWithOptions(cornerImageSize, NO, [UIScreen mainScreen].scale);
+
+ CGContextRef context = UIGraphicsGetCurrentContext();
+ CGContextSaveGState(context);
+ CGContextAddRect(context, cornerImageBounds);
+
+ UIBezierPath *cornerPath = [UIBezierPath bezierPathWithRoundedRect:cornerImageBounds byRoundingCorners:(UIRectCorner)UIAllCorners cornerRadii:CGSizeMake(indicatorCornerRadius, indicatorCornerRadius)];
+ CGContextAddPath(context, [cornerPath CGPath]);
+ CGContextEOClip(context);
+ CGContextFillRect(context, cornerImageBounds);
+ CGContextRestoreGState(context);
+
+ UIImage *cornerImage = UIGraphicsGetImageFromCurrentImageContext();
+
+ UIGraphicsEndImageContext();
+
+ UIView *contentView = [_backdropView contentView];
+
+ UIEdgeInsets capInsets = UIEdgeInsetsMake(indicatorCornerRadius, indicatorCornerRadius, indicatorCornerRadius, indicatorCornerRadius);
+ cornerImage = [cornerImage resizableImageWithCapInsets:capInsets];
+
+ RetainPtr<UIImageView> cornerMaskView = adoptNS([[UIImageView alloc] initWithImage:cornerImage]);
+ [cornerMaskView setAlpha:0];
+ [cornerMaskView _setBackdropMaskViewFlags:_UIBackdropMaskViewAll];
+ [cornerMaskView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+ [cornerMaskView setFrame:contentView.bounds];
+
+ [contentView addSubview:cornerMaskView.get()];
+}
+
+@end
+
+#endif /* PLATFORM(IOS) */
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "WKPDFPageNumberIndicator.h"
</ins><span class="cx"> #import <CorePDF/UIPDFDocument.h>
</span><span class="cx"> #import <CorePDF/UIPDFPageView.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="lines">@@ -51,12 +52,17 @@
</span><span class="cx"> @implementation WKPDFView {
</span><span class="cx"> RetainPtr<UIPDFDocument> _pdfDocument;
</span><span class="cx"> RetainPtr<NSString> _suggestedFilename;
</span><ins>+ RetainPtr<WKPDFPageNumberIndicator> _pageNumberIndicator;
</ins><span class="cx">
</span><span class="cx"> Vector<PDFPageInfo> _pages;
</span><span class="cx"> CGRect _documentFrame;
</span><ins>+ unsigned _centerPageNumber;
</ins><span class="cx">
</span><span class="cx"> CGSize _minimumSize;
</span><ins>+ CGSize _overlaidAccessoryViewsInset;
+ UIEdgeInsets _obscuredInsets;
</ins><span class="cx"> UIScrollView *_scrollView;
</span><ins>+ UIView *_fixedOverlayView;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame
</span><span class="lines">@@ -69,6 +75,12 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ [_pageNumberIndicator removeFromSuperview];
+ [super dealloc];
+}
+
</ins><span class="cx"> - (NSString *)suggestedFilename
</span><span class="cx"> {
</span><span class="cx"> return _suggestedFilename.get();
</span><span class="lines">@@ -111,6 +123,7 @@
</span><span class="cx"> [_scrollView setMinimumZoomScale:pdfMinimumZoomScale];
</span><span class="cx"> [_scrollView setMaximumZoomScale:pdfMaximumZoomScale];
</span><span class="cx"> [_scrollView setContentSize:_documentFrame.size];
</span><ins>+ [_scrollView setBackgroundColor:[UIColor grayColor]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidScroll:(UIScrollView *)scrollView
</span><span class="lines">@@ -119,6 +132,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self _revalidateViews];
</span><ins>+ [_pageNumberIndicator show];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_revalidateViews
</span><span class="lines">@@ -127,15 +141,24 @@
</span><span class="cx">
</span><span class="cx"> // We apply overdraw after applying scale in order to avoid excessive
</span><span class="cx"> // memory use caused by scaling the overdraw.
</span><del>- targetRect = CGRectInset(targetRect, 0, -targetRect.size.height * overdrawHeightMultiplier);
</del><ins>+ CGRect targetRectWithOverdraw = CGRectInset(targetRect, 0, -targetRect.size.height * overdrawHeightMultiplier);
+ CGRect targetRectForCenterPage = CGRectInset(targetRect, 0, targetRect.size.height / 2 - pdfPageMargin * 2);
</ins><span class="cx">
</span><ins>+ _centerPageNumber = 0;
+ unsigned currentPage = 0;
+
</ins><span class="cx"> for (auto& pageInfo : _pages) {
</span><del>- if (!CGRectIntersectsRect(pageInfo.frame, targetRect)) {
</del><ins>+ ++currentPage;
+
+ if (!CGRectIntersectsRect(pageInfo.frame, targetRectWithOverdraw)) {
</ins><span class="cx"> [pageInfo.view removeFromSuperview];
</span><span class="cx"> pageInfo.view = nullptr;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!_centerPageNumber && CGRectIntersectsRect(pageInfo.frame, targetRectForCenterPage))
+ _centerPageNumber = currentPage;
+
</ins><span class="cx"> if (pageInfo.view)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -146,11 +169,54 @@
</span><span class="cx"> [pageInfo.view setFrame:pageInfo.frame];
</span><span class="cx"> [pageInfo.view contentLayer].contentsScale = self.window.screen.scale;
</span><span class="cx"> }
</span><ins>+
+ [self _updatePageNumberIndicator];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGPoint)_offsetForPageNumberIndicator
+{
+ return CGPointMake(_obscuredInsets.left, _obscuredInsets.top + _overlaidAccessoryViewsInset.height);
+}
+
+- (void)_updatePageNumberIndicator
+{
+ if (!_pageNumberIndicator)
+ _pageNumberIndicator = adoptNS([[WKPDFPageNumberIndicator alloc] initWithFrame:CGRectZero]);
+
+ [_fixedOverlayView addSubview:_pageNumberIndicator.get()];
+
+ [_pageNumberIndicator setCurrentPageNumber:_centerPageNumber];
+ [_pageNumberIndicator moveToPoint:[self _offsetForPageNumberIndicator] animated:NO];
+}
+
+- (void)web_setObscuredInsets:(UIEdgeInsets)insets
+{
+ if (UIEdgeInsetsEqualToEdgeInsets(insets, _obscuredInsets))
+ return;
+
+ _obscuredInsets = insets;
+
+ [self _updatePageNumberIndicator];
+}
+
+- (void)web_setOverlaidAccessoryViewsInset:(CGSize)inset
+{
+ _overlaidAccessoryViewsInset = inset;
+ [_pageNumberIndicator moveToPoint:[self _offsetForPageNumberIndicator] animated:YES];
+}
+
+- (void)web_setFixedOverlayView:(UIView *)fixedOverlayView
+{
+ _fixedOverlayView = fixedOverlayView;
+
+ if (_pageNumberIndicator)
+ [_fixedOverlayView addSubview:_pageNumberIndicator.get()];
+}
+
</ins><span class="cx"> - (void)_computePageAndDocumentFrames
</span><span class="cx"> {
</span><span class="cx"> NSUInteger pageCount = [_pdfDocument numberOfPages];
</span><ins>+ [_pageNumberIndicator setPageCount:pageCount];
</ins><span class="cx">
</span><span class="cx"> for (auto& pageInfo : _pages)
</span><span class="cx"> [pageInfo.view removeFromSuperview];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (169289 => 169290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-23 23:32:38 UTC (rev 169289)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-23 23:52:12 UTC (rev 169290)
</span><span class="lines">@@ -538,6 +538,8 @@
</span><span class="cx"> 2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */; };
</span><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */; };
</span><span class="cx"> 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
</span><ins>+ 2D6AB541192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */; };
+ 2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6AB540192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm */; };
</ins><span class="cx"> 2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */; };
</span><span class="cx"> 2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */; };
</span><span class="lines">@@ -2476,6 +2478,8 @@
</span><span class="cx"> 2D429BFB1721E2BA00EC681F /* PDFPluginPasswordField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PDFPluginPasswordField.mm; path = PDF/PDFPluginPasswordField.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56A1810714E003A3AEE /* RemoteLayerBackingStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerBackingStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerBackingStore.h; sourceTree = "<group>"; };
</span><ins>+ 2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPDFPageNumberIndicator.h; path = ios/WKPDFPageNumberIndicator.h; sourceTree = "<group>"; };
+ 2D6AB540192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFPageNumberIndicator.mm; path = ios/WKPDFPageNumberIndicator.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKThumbnailView.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKThumbnailView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewSnapshotStore.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4693,6 +4697,8 @@
</span><span class="cx"> 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */,
</span><span class="cx"> 2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */,
</span><span class="cx"> 2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */,
</span><ins>+ 2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */,
+ 2D6AB540192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm */,
</ins><span class="cx"> 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */,
</span><span class="cx"> 2DF9593418A42412009785A1 /* ViewGestureControllerIOS.mm */,
</span><span class="cx"> 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */,
</span><span class="lines">@@ -7290,6 +7296,7 @@
</span><span class="cx"> F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */,
</span><span class="cx"> F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */,
</span><span class="cx"> F62A765D12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h in Headers */,
</span><ins>+ 2D6AB541192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h in Headers */,
</ins><span class="cx"> 1A445BA3184D5FCF004B3414 /* WKContextDownloadClient.h in Headers */,
</span><span class="cx"> 1AC1338618590C4600F3EC05 /* RemoteObjectRegistryMessages.h in Headers */,
</span><span class="cx"> BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */,
</span><span class="lines">@@ -8660,6 +8667,7 @@
</span><span class="cx"> 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */,
</span><span class="cx"> BC14DF78120B5B7900826C0C /* InjectedBundleScriptWorld.cpp in Sources */,
</span><span class="cx"> 1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
</span><ins>+ 2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */,
</ins><span class="cx"> 1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
</span><span class="cx"> BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */,
</span><span class="cx"> 1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>