Attachment 360300 Details for Bug 193884 – Patch v1

[patch] Patch v1

bug-193884-20190127111855.patch (text/plain), 11.89 KB, created by David Kilzer (:ddkilzer) on 2019-01-27 11:18:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2019-01-27 11:18:56 PST

Size: 11.89 KB

patch

obsolete

>Subversion Revision: 240485
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b3c1406bc440524e3480624ea944f2be21e0c420..b05a1ef106c4d6fdf35c2cc1fe3f7a7107db9545 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-01-27  David Kilzer  <ddkilzer@apple.com>
>+
>+        REGRESSION (r236481): Move soft-linking of LocalAuthentication.framework out of LocalAuthenticationSoftLink.h
>+        <https://webkit.org/b/193884>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * SourcesCocoa.txt:
>+        * UnifiedSources-input.xcfilelist:
>+        * WebKit.xcodeproj/project.pbxproj:
>+        - Add LocalAuthenticationSoftLink.mm to the project.
>+
>+        * UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h:
>+        * UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm: Copied from Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h.
>+        - Move soft-linking implementation to
>+          LocalAuthenticationSoftLink.mm.
>+
> 2019-01-26  David Kilzer  <ddkilzer@apple.com>
> 
>         Move soft-linking of ManagedConfiguration.framework out of ManagedConfigurationSPI.h
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index 66964cd51b129b2e4f117bedd8f042b5ed2e1b6b..4db08ffea2876832765c85956813dcc68f046c59 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -470,6 +470,7 @@ UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
> 
> UIProcess/WebAuthentication/Cocoa/HidConnection.mm
> UIProcess/WebAuthentication/Cocoa/HidService.mm
>+UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm @no-unify
> UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm
> UIProcess/WebAuthentication/Cocoa/LocalConnection.mm
> UIProcess/WebAuthentication/Cocoa/LocalService.mm
>diff --git a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h
>index dc3bb33497711d5346c1f326940a38d155e75109..1552b273903aa6482a393b8d3879a03f48e655a2 100644
>--- a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h
>+++ b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -28,6 +28,6 @@
> #import <LocalAuthentication/LocalAuthentication.h>
> #import <wtf/SoftLinking.h>
> 
>-SOFT_LINK_FRAMEWORK(LocalAuthentication);
>+SOFT_LINK_FRAMEWORK_FOR_HEADER(WebKit, LocalAuthentication);
> 
>-SOFT_LINK_CLASS(LocalAuthentication, LAContext);
>+SOFT_LINK_CLASS_FOR_HEADER(WebKit, LAContext);
>diff --git a/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..dc395d246458fb576a4b59cf177ffd5d69dec95a
>--- /dev/null
>+++ b/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm
>@@ -0,0 +1,32 @@
>+/*
>+ * Copyright (C) 2018-2019 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 <wtf/SoftLinking.h>
>+
>+SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebKit, LocalAuthentication);
>+
>+SOFT_LINK_CLASS_FOR_SOURCE(WebKit, LocalAuthentication, LAContext);
>diff --git a/Source/WebKit/UnifiedSources-input.xcfilelist b/Source/WebKit/UnifiedSources-input.xcfilelist
>index 15b8099e69dbfcd2837789d6db0c1b9ef336e235..33b137bcaf9490cfc710f51cc038c9e42c4442f6 100644
>--- a/Source/WebKit/UnifiedSources-input.xcfilelist
>+++ b/Source/WebKit/UnifiedSources-input.xcfilelist
>@@ -576,6 +576,7 @@ $(SRCROOT)/UIProcess/WebAuthentication/AuthenticatorManager.cpp
> $(SRCROOT)/UIProcess/WebAuthentication/AuthenticatorTransportService.cpp
> $(SRCROOT)/UIProcess/WebAuthentication/Cocoa/HidConnection.mm
> $(SRCROOT)/UIProcess/WebAuthentication/Cocoa/HidService.mm
>+$(SRCROOT)/UIProcess/WebAuthentication/Cocoa/LocalAuthenticationSoftLink.mm
> $(SRCROOT)/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm
> $(SRCROOT)/UIProcess/WebAuthentication/Cocoa/LocalConnection.mm
> $(SRCROOT)/UIProcess/WebAuthentication/Cocoa/LocalService.mm
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 14d56089f586a3a07a4cb90f26fb8f2ce9c4e5d4..844177348b37648e5e072be5ba2f86f7be2f6675 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -884,6 +884,7 @@
> 		41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */; };
> 		41FAF5F51E3C0649001AE678 /* WebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */; };
> 		41FAF5F81E3C1021001AE678 /* LibWebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */; };
>+		449D90DA21FDC30B00F677C0 /* LocalAuthenticationSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 449D90D821FD63FE00F677C0 /* LocalAuthenticationSoftLink.mm */; };
> 		460F488F1F996F7100CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 460F488D1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp */; };
> 		460F48901F996F7100CF4B87 /* WebSWContextManagerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 460F488E1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessages.h */; };
> 		463FD4801EB9459600A2982C /* WKProcessTerminationReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 463FD47F1EB9458400A2982C /* WKProcessTerminationReason.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3070,6 +3071,7 @@
> 		41FBE823206DA79C000F0741 /* NetworkContentRuleListManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NetworkContentRuleListManager.messages.in; sourceTree = "<group>"; };
> 		41FBE824206DA79C000F0741 /* NetworkContentRuleListManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkContentRuleListManager.cpp; sourceTree = "<group>"; };
> 		4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedMemoryCocoa.cpp; sourceTree = "<group>"; };
>+		449D90D821FD63FE00F677C0 /* LocalAuthenticationSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalAuthenticationSoftLink.mm; sourceTree = "<group>"; };
> 		44A481C621F2D27B00F2F919 /* ClientCertificateAuthenticationXPCConstants.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ClientCertificateAuthenticationXPCConstants.cpp; sourceTree = "<group>"; };
> 		460F488D1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSWContextManagerConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/WebSWContextManagerConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
> 		460F488E1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSWContextManagerConnectionMessages.h; path = DerivedSources/WebKit2/WebSWContextManagerConnectionMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
>@@ -6758,6 +6760,7 @@
> 				5772F204217DBD6A0056BF2C /* HidService.h */,
> 				5772F205217DBD6A0056BF2C /* HidService.mm */,
> 				578DC2972155A0010074E815 /* LocalAuthenticationSoftLink.h */,
>+				449D90D821FD63FE00F677C0 /* LocalAuthenticationSoftLink.mm */,
> 				57DCEDA12149C1E20016B847 /* LocalAuthenticator.h */,
> 				57DCEDA32149DFF50016B847 /* LocalAuthenticator.mm */,
> 				57DCEDA7214A568B0016B847 /* LocalConnection.h */,
>@@ -10728,6 +10731,7 @@
> 				2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */,
> 				2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */,
> 				2984F57C164B915F004BC0C6 /* LegacyCustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
>+				449D90DA21FDC30B00F677C0 /* LocalAuthenticationSoftLink.mm in Sources */,
> 				2D92A779212B6A6100F493FD /* Logging.cpp in Sources */,
> 				2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */,
> 				2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */,
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a5446feb1600c9b1b7b24b17adf313dcc824f0f1..fa62bef24fe1a58e3c3337147a52d128d9b32a00 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-27  David Kilzer  <ddkilzer@apple.com>
>+
>+        REGRESSION (r236481): Move soft-linking of LocalAuthentication.framework out of LocalAuthenticationSoftLink.h
>+        <https://webkit.org/b/193884>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/style/checkers/cpp.py:
>+        (check_language): Add LocalAuthentication to
>+        `frameworks_with_soft_links`.
>+
> 2019-01-25  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(PSON) cross-site provisional page is not canceled if a new same-site one is started
>diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py
>index a5afac8aa6d330335aaffe753798e37a9f996297..4877b026880274de171c32f3883cc38200a0c5cc 100644
>--- a/Tools/Scripts/webkitpy/style/checkers/cpp.py
>+++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py
>@@ -3339,7 +3339,7 @@ def check_language(filename, clean_lines, line_number, file_extension, include_s
>             error(line_number, 'softlink/header', 5,
>                   'Never soft-link frameworks in headers. Put the soft-link macros in a source file, or create {framework}SoftLink.{{cpp,mm}} instead.'.format(framework=framework_name))
> 
>-        frameworks_with_soft_links = ['CoreMedia', 'CoreVideo', 'DataDetectorsCore', 'MediaAccessibility', 'MediaRemote', 'PassKit', 'QuickLook', 'UIKit', 'VideoToolbox']
>+        frameworks_with_soft_links = ['CoreMedia', 'CoreVideo', 'DataDetectorsCore', 'LocalAuthentication', 'MediaAccessibility', 'MediaRemote', 'PassKit', 'QuickLook', 'UIKit', 'VideoToolbox']
>         if framework_name in frameworks_with_soft_links and not re.compile('^\s*SOFT_LINK_(PRIVATE_)?FRAMEWORK_FOR_(HEADER|SOURCE)(_WITH_EXPORT)?${}$'.format(framework_name)).search(line):
>             error(line_number, 'softlink/framework', 5,
>                   'Use {framework}SoftLink.{{cpp,h,mm}} to soft-link to {framework}.framework.'.format(framework=framework_name))

Actions: View | Formatted Diff | Diff

Attachments on bug 193884: 360300