Changeset 229581 in webkit

Timestamp:

Mar 13, 2018 12:25:53 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r229575. rdar://problem/38219763

Location:

tags/Safari-606.1.7.1/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm (modified) (2 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)

tags/Safari-606.1.7.1/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-13  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r229575. rdar://problem/38219763
+
+    2018-03-13  Jiewen Tan  <jiewen_tan@apple.com>
+
+            Soft-link LocalAuthentication.Framework
+            https://bugs.webkit.org/show_bug.cgi?id=183587
+            <rdar://problem/38219763>
+
+            Reviewed by Brian Burg.
+
+            * UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm:
+            (WebKit::WebCredentialsMessengerProxy::platformIsUserVerifyingPlatformAuthenticatorAvailable):
+            * WebKit.xcodeproj/project.pbxproj:
+
 2018-03-06  Kocsen Chung  <kocsen_chung@apple.com>
 

tags/Safari-606.1.7.1/Source/WebKit/UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm

@@ -32 +32 @@
 #import <WebCore/NotImplemented.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/SoftLinking.h>
+
+SOFT_LINK_FRAMEWORK(LocalAuthentication)
+SOFT_LINK_CLASS(LocalAuthentication, LAContext);
 
 namespace WebKit {
@@ -41 +45 @@
     notImplemented();
 #else
-    auto context = adoptNS([[LAContext alloc] init]);
+    auto context = adoptNS([allocLAContextInstance() init]);
     NSError *error = nil;
 

tags/Safari-606.1.7.1/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -1213 +1213 @@
                 53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */; };
                 53DEA3661DDE423100E82648 /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 53DEA3651DDE422E00E82648 /* json.hpp */; };
-                5750F32B2032D4E500389347 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750F32A2032D4E500389347 /* LocalAuthentication.framework */; };
                 5760828E2029895E00116678 /* WebCredentialsMessenger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5760828C2029854200116678 /* WebCredentialsMessenger.cpp */; };
                 57608298202BD8BA00116678 /* WebCredentialsMessengerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57608296202BD8BA00116678 /* WebCredentialsMessengerProxy.cpp */; };
@@ -4729 +4728 @@
                                 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
                                 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
-                                5750F32B2032D4E500389347 /* LocalAuthentication.framework in Frameworks */,
                                 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
                                 37694525184FC6B600CDE21F /* Security.framework in Frameworks */,