[iOS] Rename WKPDFView to WKLegacyPDFView

https://bugs.webkit.org/show_bug.cgi?id=184286

Rubber-stamped by Wenson Hsieh.

A series of upcoming patches will implement a new WKPDFView based on PDFKit.

* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
(-[WKWebViewContentProviderRegistry init]):
* UIProcess/ios/WKLegacyPDFView.h: Renamed from Source/WebKit/UIProcess/ios/WKPDFView.h.
* UIProcess/ios/WKLegacyPDFView.mm: Renamed from Source/WebKit/UIProcess/ios/WKPDFView.mm.
(-[WKLegacyPDFView _computeMatchesForString:options:maxCount:completionHandler:]):
* WebKit.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index bbb5ea6..e8f491a 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2018-04-04  Andy Estes  <aestes@apple.com>
+
+        [iOS] Rename WKPDFView to WKLegacyPDFView
+        https://bugs.webkit.org/show_bug.cgi?id=184286
+
+        Rubber-stamped by Wenson Hsieh.
+
+        A series of upcoming patches will implement a new WKPDFView based on PDFKit.
+
+        * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+        (-[WKWebViewContentProviderRegistry init]):
+        * UIProcess/ios/WKLegacyPDFView.h: Renamed from Source/WebKit/UIProcess/ios/WKPDFView.h.
+        * UIProcess/ios/WKLegacyPDFView.mm: Renamed from Source/WebKit/UIProcess/ios/WKPDFView.mm.
+        (-[WKLegacyPDFView _computeMatchesForString:options:maxCount:completionHandler:]):
+        * WebKit.xcodeproj/project.pbxproj:
+
 2018-04-04  Yousuke Kimoto  <yousuke.kimoto@sony.com> and Fujii Hironori  <Hironori.Fujii@sony.com>
 
         [WinCairo] Add WebKit Shared/win files for wincairo webkit

diff --git a/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm b/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
index 03c80e1..dc81f53 100644 (file)
--- a/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
@@ -30,7 +30,7 @@
 
 #if PLATFORM(IOS)
 
-#import "WKPDFView.h"
+#import "WKLegacyPDFView.h"
 #import "WKSystemPreviewView.h"
 #import "WKWebViewInternal.h"
 #import "WebPageProxy.h"
@@ -58,7 +58,7 @@ using namespace WebKit;
 
 #if ENABLE(WKPDFVIEW)
     for (auto& mimeType : WebCore::MIMETypeRegistry::getPDFMIMETypes())
-        [self registerProvider:[WKPDFView class] forMIMEType:mimeType];
+        [self registerProvider:[WKLegacyPDFView class] forMIMEType:mimeType];
 #endif
 
 #if PLATFORM(IOS) && USE(QUICK_LOOK) && USE(APPLE_INTERNAL_SDK)

diff --git a/Source/WebKit/UIProcess/ios/WKPDFView.h b/Source/WebKit/UIProcess/ios/WKLegacyPDFView.h
similarity index 90%
rename from Source/WebKit/UIProcess/ios/WKPDFView.h
rename to Source/WebKit/UIProcess/ios/WKLegacyPDFView.h
index 34f0e1f..db239f2 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKPDFView.h
+++ b/Source/WebKit/UIProcess/ios/WKLegacyPDFView.h
@@ -29,7 +29,7 @@
 #import "WKActionSheetAssistant.h"
 #import "WKWebViewContentProvider.h"
 
-@interface WKPDFView : UIView <WKWebViewContentProvider, UIPDFPageViewDelegate, UIPDFAnnotationControllerDelegate, WKActionSheetAssistantDelegate>
+@interface WKLegacyPDFView : UIView <WKWebViewContentProvider, UIPDFPageViewDelegate, UIPDFAnnotationControllerDelegate, WKActionSheetAssistantDelegate>
 @end
 
 #endif // PLATFORM(IOS) && ENABLE(WKPDFVIEW)

diff --git a/Source/WebKit/UIProcess/ios/WKPDFView.mm b/Source/WebKit/UIProcess/ios/WKLegacyPDFView.mm
similarity index 99%
rename from Source/WebKit/UIProcess/ios/WKPDFView.mm
rename to Source/WebKit/UIProcess/ios/WKLegacyPDFView.mm
index 3bcc872..1dae911 100644 (file)
--- a/Source/WebKit/UIProcess/ios/WKPDFView.mm
+++ b/Source/WebKit/UIProcess/ios/WKLegacyPDFView.mm
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WKPDFView.h"
+#import "WKLegacyPDFView.h"
 
 #if PLATFORM(IOS) && ENABLE(WKPDFVIEW)
 
@@ -73,11 +73,11 @@ typedef struct {
     unsigned index;
 } PDFPageInfo;
 
-@interface WKPDFView ()
+@interface WKLegacyPDFView ()
 - (void)_resetZoomAnimated:(BOOL)animated;
 @end
 
-@implementation WKPDFView {
+@implementation WKLegacyPDFView {
     RetainPtr<CGPDFDocumentRef> _cgPDFDocument;
     RetainPtr<UIPDFDocument> _pdfDocument;
     RetainPtr<NSString> _suggestedFilename;
@@ -541,7 +541,7 @@ static NSStringCompareOptions stringCompareOptions(_WKFindOptions options)
     _nextCachedFindOptionsAffectingResults = optionsAffectingResults;
     _nextCachedFindMaximumCount = maxCount;
 
-    RetainPtr<WKPDFView> retainedSelf = self;
+    RetainPtr<WKLegacyPDFView> retainedSelf = self;
     typeof(completionHandler) completionHandlerCopy = Block_copy(completionHandler);
 
     dispatch_async(_findQueue, [pages, string, findOptions, optionsAffectingResults, maxCount, computeMatchesOperationID, retainedSelf, completionHandlerCopy] {
@@ -866,10 +866,10 @@ static NSStringCompareOptions stringCompareOptions(_WKFindOptions options)
 
 #pragma mark Printing
 
-@interface WKPDFView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
+@interface WKLegacyPDFView (_WKWebViewPrintFormatter) <_WKWebViewPrintProvider>
 @end
 
-@implementation WKPDFView (_WKWebViewPrintFormatter)
+@implementation WKLegacyPDFView (_WKWebViewPrintFormatter)
 
 - (NSUInteger)_wk_pageCountForPrintFormatter:(_WKWebViewPrintFormatter *)printFormatter
 {

diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
index ff99c50..100b2fd 100644 (file)
--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -675,8 +675,8 @@
                2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */; };
                2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */; };
                2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
-               2DA1E4FE18C02B6A00DBC929 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */; };
-               2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */; };
+               2DA1E4FE18C02B6A00DBC929 /* WKLegacyPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA1E4FC18C02B6A00DBC929 /* WKLegacyPDFView.h */; };
+               2DA1E4FF18C02B6A00DBC929 /* WKLegacyPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA1E4FD18C02B6A00DBC929 /* WKLegacyPDFView.mm */; };
                2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
                2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
                2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
@@ -3040,8 +3040,8 @@
                2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCALayerRemote.h; sourceTree = "<group>"; };
                2DA049B5180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerCARemote.cpp; sourceTree = "<group>"; };
                2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerCARemote.h; sourceTree = "<group>"; };
-               2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPDFView.h; path = ios/WKPDFView.h; sourceTree = "<group>"; };
-               2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFView.mm; path = ios/WKPDFView.mm; sourceTree = "<group>"; };
+               2DA1E4FC18C02B6A00DBC929 /* WKLegacyPDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKLegacyPDFView.h; path = ios/WKLegacyPDFView.h; sourceTree = "<group>"; };
+               2DA1E4FD18C02B6A00DBC929 /* WKLegacyPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKLegacyPDFView.mm; path = ios/WKLegacyPDFView.mm; sourceTree = "<group>"; };
                2DA7FDCB18F88625008DDED0 /* FindIndicatorOverlayClientIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FindIndicatorOverlayClientIOS.h; path = ios/FindIndicatorOverlayClientIOS.h; sourceTree = "<group>"; };
                2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
                2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
@@ -5814,12 +5814,12 @@
                                0F3C7257196F5F5000AEDD0C /* WKInspectorHighlightView.mm */,
                                A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */,
                                A54293A3195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.mm */,
+                               2DA1E4FC18C02B6A00DBC929 /* WKLegacyPDFView.h */,
+                               2DA1E4FD18C02B6A00DBC929 /* WKLegacyPDFView.mm */,
                                A15EEDE41E301CEE000069B0 /* WKPasswordView.h */,
                                A15EEDE31E301CEE000069B0 /* WKPasswordView.mm */,
                                2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */,
                                2D6AB540192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm */,
-                               2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */,
-                               2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */,
                                0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */,
                                0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */,
                                26F10BE619187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.h */,
@@ -9551,6 +9551,7 @@
                                A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */,
                                51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
                                2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
+                               2DA1E4FE18C02B6A00DBC929 /* WKLegacyPDFView.h in Headers */,
                                C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
                                C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
                                1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
@@ -9621,7 +9622,6 @@
                                A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */,
                                A15EEDE61E301CEE000069B0 /* WKPasswordView.h in Headers */,
                                2D6AB541192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h in Headers */,
-                               2DA1E4FE18C02B6A00DBC929 /* WKPDFView.h in Headers */,
                                7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */,
                                2DABA7741A817EE600EF0F1A /* WKPluginLoadPolicy.h in Headers */,
                                1AFDD3171891C94700153970 /* WKPreferences.h in Headers */,
@@ -11264,6 +11264,7 @@
                                A5C0F0AC2000658500536536 /* WKInspectorWindow.mm in Sources */,
                                A518B5D31FE1D55B00F9FA28 /* WKInspectorWKWebView.mm in Sources */,
                                51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
+                               2DA1E4FF18C02B6A00DBC929 /* WKLegacyPDFView.mm in Sources */,
                                C98C48A91B6FD5B500145103 /* WKMediaSessionFocusManager.cpp in Sources */,
                                C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */,
                                1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */,
@@ -11304,7 +11305,6 @@
                                BCE17B7D1381F1170012A641 /* WKPagePrivateMac.mm in Sources */,
                                A15EEDE51E301CEE000069B0 /* WKPasswordView.mm in Sources */,
                                2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */,
-                               2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */,
                                7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */,
                                BCD597D1112B56AC00EC8C23 /* WKPreferences.cpp in Sources */,
                                1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */,