Title: [229731] tags/Safari-606.1.9.4/Source/WebKit
- Revision
- 229731
- Author
- jmarc...@apple.com
- Date
- 2018-03-19 18:56:40 -0700 (Mon, 19 Mar 2018)
Log Message
Cherry-pick r229575. rdar://problem/38535115
Modified Paths
Diff
Modified: tags/Safari-606.1.9.4/Source/WebKit/ChangeLog (229730 => 229731)
--- tags/Safari-606.1.9.4/Source/WebKit/ChangeLog 2018-03-20 01:21:23 UTC (rev 229730)
+++ tags/Safari-606.1.9.4/Source/WebKit/ChangeLog 2018-03-20 01:56:40 UTC (rev 229731)
@@ -1,5 +1,21 @@
2018-03-19 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r229575. rdar://problem/38535115
+
+ 2018-03-13 Jiewen Tan <jiewen_...@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-19 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r229684. rdar://problem/38516584
2018-03-16 Megan Gardner <megan_gard...@apple.com>
Modified: tags/Safari-606.1.9.4/Source/WebKit/UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm (229730 => 229731)
--- tags/Safari-606.1.9.4/Source/WebKit/UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm 2018-03-20 01:21:23 UTC (rev 229730)
+++ tags/Safari-606.1.9.4/Source/WebKit/UIProcess/CredentialManagement/cocoa/WebCredentialsMessengerProxyCocoa.mm 2018-03-20 01:56:40 UTC (rev 229731)
@@ -31,7 +31,11 @@
#import <LocalAuthentication/LocalAuthentication.h>
#import <WebCore/NotImplemented.h>
#import <wtf/RetainPtr.h>
+#import <wtf/SoftLinking.h>
+SOFT_LINK_FRAMEWORK(LocalAuthentication)
+SOFT_LINK_CLASS(LocalAuthentication, LAContext);
+
namespace WebKit {
void WebCredentialsMessengerProxy::platformIsUserVerifyingPlatformAuthenticatorAvailable(uint64_t messageId)
@@ -40,7 +44,7 @@
ASSERT_UNUSED(messageId, messageId);
notImplemented();
#else
- auto context = adoptNS([[LAContext alloc] init]);
+ auto context = adoptNS([allocLAContextInstance() init]);
NSError *error = nil;
if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&error])
Modified: tags/Safari-606.1.9.4/Source/WebKit/WebKit.xcodeproj/project.pbxproj (229730 => 229731)
--- tags/Safari-606.1.9.4/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-03-20 01:21:23 UTC (rev 229730)
+++ tags/Safari-606.1.9.4/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-03-20 01:56:40 UTC (rev 229731)
@@ -1216,7 +1216,6 @@
53BA47D01DC2EF5E004DF4AD /* NetworkDataTaskBlob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */; };
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 */; };
5760829C202D2C3C00116678 /* WebCredentialsMessengerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5760829020298FBD00116678 /* WebCredentialsMessengerMessageReceiver.cpp */; };
@@ -4735,7 +4734,6 @@
files = (
3766F9EE189A1241003CF19B /* _javascript_Core.framework in Frameworks */,
3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
- 5750F32B2032D4E500389347 /* LocalAuthentication.framework in Frameworks */,
3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
