Attachment 360237 Details for Bug 193866 – Patch v1

[patch] Patch v1

bug-193866-20190126080401.patch (text/plain), 10.71 KB, created by David Kilzer (:ddkilzer) on 2019-01-26 08:04:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2019-01-26 08:04:02 PST

Size: 10.71 KB

patch

obsolete

>Subversion Revision: 240485
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 115c14abc97cc1a56b39afaf4187a654e774be4e..343c91a48bbc0ba81045884902e6b142d3efb33a 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-26  David Kilzer  <ddkilzer@apple.com>
>+
>+        Move soft-linking of TelephonyUtilities.framework out of TUCallSPI.h
>+        <https://webkit.org/b/193866>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PAL.xcodeproj/project.pbxproj:
>+        * pal/PlatformMac.cmake:
>+        - Update for rename of TUCallSPI.h to TelephonyUtilitiesSPI.h.
>+
>+        * pal/spi/mac/TelephonyUtilitiesSPI.h: Rename from Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h.
>+        - Remove soft-linking code from header.
>+
> 2019-01-25  David Kilzer  <ddkilzer@apple.com>
> 
>         Move soft-linking of Lookup.framework out of LookupSPI.h
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 36fb7c1120456b29d5ce197e68ad519281d08a45..dcc7feb90a198ce37dc2f772d8483be537e1013c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-26  David Kilzer  <ddkilzer@apple.com>
>+
>+        Move soft-linking of TelephonyUtilities.framework out of TUCallSPI.h
>+        <https://webkit.org/b/193866>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Platform/mac/MenuUtilities.mm:
>+        - Update for rename of TUCallSPI.h to TelephonyUtilitiesSPI.h.
>+        - Add soft-linking code formerly in TUCallSPI.h.
>+
> 2019-01-25  David Kilzer  <ddkilzer@apple.com>
> 
>         Move soft-linking of Lookup.framework out of LookupSPI.h
>diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>index a65e91d6990e56e9755c8c5bb2768e0f98f5b540..032d0084c55eb24d54fb79c432f67226cd3730ff 100644
>--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>@@ -96,7 +96,7 @@
> 		0C77859E1F45130F00F4EBB6 /* PIPSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785851F45130F00F4EBB6 /* PIPSPI.h */; };
> 		0C77859F1F45130F00F4EBB6 /* QTKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785861F45130F00F4EBB6 /* QTKitSPI.h */; };
> 		0C7785A01F45130F00F4EBB6 /* QuickLookMacSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */; };
>-		0C7785A11F45130F00F4EBB6 /* TUCallSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785881F45130F00F4EBB6 /* TUCallSPI.h */; };
>+		0C7785A11F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C7785881F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h */; };
> 		0CF99CA41F736375007EE793 /* MediaTimeAVFoundation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0C00CFD11F68CE4600AAC26D /* MediaTimeAVFoundation.cpp */; };
> 		0CF99CA81F738437007EE793 /* CoreMediaSoftLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */; };
> 		0CF99CA91F738437007EE793 /* CoreMediaSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */; };
>@@ -250,7 +250,7 @@
> 		0C7785851F45130F00F4EBB6 /* PIPSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PIPSPI.h; sourceTree = "<group>"; };
> 		0C7785861F45130F00F4EBB6 /* QTKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QTKitSPI.h; sourceTree = "<group>"; };
> 		0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookMacSPI.h; sourceTree = "<group>"; };
>-		0C7785881F45130F00F4EBB6 /* TUCallSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUCallSPI.h; sourceTree = "<group>"; };
>+		0C7785881F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TelephonyUtilitiesSPI.h; sourceTree = "<group>"; };
> 		0CF99CA61F738436007EE793 /* CoreMediaSoftLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreMediaSoftLink.cpp; sourceTree = "<group>"; };
> 		0CF99CA71F738437007EE793 /* CoreMediaSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreMediaSoftLink.h; sourceTree = "<group>"; };
> 		1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; };
>@@ -481,7 +481,7 @@
> 				A102658A1F56748C00B4C844 /* QuickDrawSPI.h */,
> 				0C7785871F45130F00F4EBB6 /* QuickLookMacSPI.h */,
> 				A1175B481F6AFF8E00C4B9F0 /* SpeechSynthesisSPI.h */,
>-				0C7785881F45130F00F4EBB6 /* TUCallSPI.h */,
>+				0C7785881F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h */,
> 			);
> 			path = mac;
> 			sourceTree = "<group>";
>@@ -779,7 +779,7 @@
> 				31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */,
> 				A3AB6E581F3D1DDB009C14B1 /* SystemSleepListener.h in Headers */,
> 				A3AB6E641F3D217F009C14B1 /* SystemSleepListenerMac.h in Headers */,
>-				0C7785A11F45130F00F4EBB6 /* TUCallSPI.h in Headers */,
>+				0C7785A11F45130F00F4EBB6 /* TelephonyUtilitiesSPI.h in Headers */,
> 				2E1342CC215AA10A007199D2 /* UIKitSoftLink.h in Headers */,
> 				0C5AF9221F43A4C7002EAC02 /* UIKitSPI.h in Headers */,
> 				0C2DA1471F3BEB4900DBC317 /* URLFormattingSPI.h in Headers */,
>diff --git a/Source/WebCore/PAL/pal/PlatformMac.cmake b/Source/WebCore/PAL/pal/PlatformMac.cmake
>index 130a7b73fa7ff4f1de2257b0de48019a460c9fe7..5e540c2a6de8eaf27a4a6cfd175ffda0be3827ac 100644
>--- a/Source/WebCore/PAL/pal/PlatformMac.cmake
>+++ b/Source/WebCore/PAL/pal/PlatformMac.cmake
>@@ -88,7 +88,7 @@ list(APPEND PAL_PUBLIC_HEADERS
>     spi/mac/QuickDrawSPI.h
>     spi/mac/QuickLookMacSPI.h
>     spi/mac/SpeechSynthesisSPI.h
>-    spi/mac/TUCallSPI.h
>+    spi/mac/TelephonyUtilitiesSPI.h
> 
>     system/cocoa/SleepDisablerCocoa.h
> 
>diff --git a/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h b/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h
>deleted file mode 100644
>index d809cfb509e702a053a63035f7057be74c96a5ee..0000000000000000000000000000000000000000
>--- a/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-/*
>- * Copyright (C) 2014 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.
>- */
>-
>-#if PLATFORM(MAC)
>-
>-#import <objc/runtime.h>
>-#import <wtf/SoftLinking.h>
>-
>-@interface TUCall : NSObject
>-@end
>-
>-@interface TUCall (Strings)
>-+ (NSString *)supplementalDialTelephonyCallString;
>-@end
>-
>-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
>-SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
>-
>-#endif
>diff --git a/Source/WebCore/PAL/pal/spi/mac/TelephonyUtilitiesSPI.h b/Source/WebCore/PAL/pal/spi/mac/TelephonyUtilitiesSPI.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..d8d07f7944cb03274e4c9a5265201011e762c424
>--- /dev/null
>+++ b/Source/WebCore/PAL/pal/spi/mac/TelephonyUtilitiesSPI.h
>@@ -0,0 +1,35 @@
>+/*
>+ * Copyright (C) 2014-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.
>+ */
>+
>+#if PLATFORM(MAC)
>+
>+@interface TUCall : NSObject
>+@end
>+
>+@interface TUCall (Strings)
>++ (NSString *)supplementalDialTelephonyCallString;
>+@end
>+
>+#endif
>diff --git a/Source/WebKit/Platform/mac/MenuUtilities.mm b/Source/WebKit/Platform/mac/MenuUtilities.mm
>index 82523b8c58db35345d1f5ec335b05dc43bb38e9d..cda8b0e902c64fc44fc7c8c300e5cb94bb7db96f 100644
>--- a/Source/WebKit/Platform/mac/MenuUtilities.mm
>+++ b/Source/WebKit/Platform/mac/MenuUtilities.mm
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2014 Apple Inc. All rights reserved.
>+ * Copyright (C) 2014-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
>@@ -30,11 +30,14 @@
> 
> #import "StringUtilities.h"
> #import <WebCore/LocalizedStrings.h>
>-#import <objc/runtime.h>
> #import <pal/spi/mac/DataDetectorsSPI.h>
> 
> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
>-#import <pal/spi/mac/TUCallSPI.h>
>+#import <pal/spi/mac/TelephonyUtilitiesSPI.h>
>+#import <wtf/SoftLinking.h>
>+
>+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
>+SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
> #endif
> 
> namespace WebKit {

Actions: View | Formatted Diff | Diff

Attachments on bug 193866: 360237 | 360238