Changeset 185706 in webkit

Timestamp:

Jun 18, 2015, 10:52:35 AM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Use SFSafariViewController for previews
​https://bugs.webkit.org/show_bug.cgi?id=146092

Reviewed by Darin Adler.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView previewViewControllerForPosition:inSourceView:]):
(-[WKContentView commitPreviewViewController:]):

• WebKit2.xcodeproj/project.pbxproj:
• Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/SafariServicesSPI.h (added)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-18  Tim Horton  <timothy_horton@apple.com>
+
+        Use SFSafariViewController for previews
+        https://bugs.webkit.org/show_bug.cgi?id=146092
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView previewViewControllerForPosition:inSourceView:]):
+        (-[WKContentView commitPreviewViewController:]):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h:
+
 2015-06-18  Antti Koivisto  <antti@apple.com>
 

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

@@ -35 +35 @@
 #import "NativeWebKeyboardEvent.h"
 #import "NativeWebTouchEvent.h"
+#import "SafariServicesSPI.h"
 #import "SmartMagnificationController.h"
 #import "TextInputSPI.h"
@@ -3132 +3133 @@
         return [uiDelegate _webView:_webView previewViewControllerForURL:targetURL];
 
-    return WKGetPreviewViewController(targetURL);
+    SFSafariViewController *previewViewController = [allocSFSafariViewControllerInstance() initWithURL:targetURL];
+    previewViewController._showingLinkPreview = YES;
+    return previewViewController;
 }
 
@@ -3143 +3146 @@
     }
 
-    UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
-    WKWillCommitPreviewViewController(viewController);
+    if (![viewController isKindOfClass:getSFSafariViewControllerClass()])
+        return;
+
+    SFSafariViewController *safariViewController = (SFSafariViewController *)viewController;
+    safariViewController._showingLinkPreview = NO;
 
     viewController.transitioningDelegate = nil;
     viewController.modalPresentationStyle = UIModalPresentationFullScreen;
+
+    UIViewController *presentingViewController = viewController.presentingViewController ?: self.window.rootViewController;
     [presentingViewController presentViewController:viewController animated:NO completion:nil];
 }

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -669 +669 @@
                 2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */; };
                 2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */; };
+                2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */; };
                 2DC6D9C318C44A610043BAD4 /* WKWebViewContentProviderRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */; };
                 2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */; };
@@ -2818 +2819 @@
                 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SmartMagnificationController.mm; path = ios/SmartMagnificationController.mm; sourceTree = "<group>"; };
                 2DAF06D818BD23BA0081CEB1 /* SmartMagnificationController.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = SmartMagnificationController.messages.in; path = ios/SmartMagnificationController.messages.in; sourceTree = "<group>"; };
+                2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafariServicesSPI.h; sourceTree = "<group>"; };
                 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewContentProviderRegistry.h; sourceTree = "<group>"; };
                 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewContentProviderRegistry.mm; sourceTree = "<group>"; };
@@ -7338 +7340 @@
                                 CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */,
                                 CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */,
+                                2DB9C4AB1B3251BD0070F27F /* SafariServicesSPI.h */,
                                 CE1A0BD01A48E6C60054EF74 /* TCCSPI.h */,
                                 CE1A0BD11A48E6C60054EF74 /* TextInputSPI.h */,
@@ -8010 +8013 @@
                                 1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */,
                                 BC306824125A6B9400E71278 /* WebProcessCreationParameters.h in Headers */,
+                                2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */,
                                 1AFA4B901A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h in Headers */,
                                 1AFA4B8C1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h in Headers */,