Attachment 360238 Details for Bug 193866 – Patch v1 (with git rename)

[patch] Patch v1 (with git rename)

0001-Move-soft-linking-of-TelephonyUtilities.framework-ou.patch (text/plain), 8.89 KB, created by David Kilzer (:ddkilzer) on 2019-01-26 08:04:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

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

Size: 8.89 KB

patch

obsolete

>From 14f3d08562a78274a049aaef437061e5722d194c Mon Sep 17 00:00:00 2001
>From: David Kilzer <ddkilzer@apple.com>
>Date: Sat, 26 Jan 2019 08:01:01 -0800
>Subject: [PATCH] Move soft-linking of TelephonyUtilities.framework out of
> TUCallSPI.h <https://webkit.org/b/193866>
>
>Reviewed by NOBODY (OOPS!).
>
>Source/WebCore/PAL:
>
>* 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.
>
>Source/WebKit:
>
>* Platform/mac/MenuUtilities.mm:
>- Update for rename of TUCallSPI.h to TelephonyUtilitiesSPI.h.
>- Add soft-linking code formerly in TUCallSPI.h.
>---
> Source/WebCore/PAL/ChangeLog                       | 14 ++++++++++++++
> Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj   |  8 ++++----
> Source/WebCore/PAL/pal/PlatformMac.cmake           |  2 +-
> .../mac/{TUCallSPI.h => TelephonyUtilitiesSPI.h}   |  8 +-------
> Source/WebKit/ChangeLog                            | 11 +++++++++++
> Source/WebKit/Platform/mac/MenuUtilities.mm        |  9 ++++++---
> 6 files changed, 37 insertions(+), 15 deletions(-)
> rename Source/WebCore/PAL/pal/spi/mac/{TUCallSPI.h => TelephonyUtilitiesSPI.h} (87%)
>
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 115c14abc97..343c91a48bb 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/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
>index a65e91d6990..032d0084c55 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 130a7b73fa7..5e540c2a6de 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/TelephonyUtilitiesSPI.h
>similarity index 87%
>rename from Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h
>rename to Source/WebCore/PAL/pal/spi/mac/TelephonyUtilitiesSPI.h
>index d809cfb509e..d8d07f7944c 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/TelephonyUtilitiesSPI.h
>@@ -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
>@@ -25,9 +25,6 @@
> 
> #if PLATFORM(MAC)
> 
>-#import <objc/runtime.h>
>-#import <wtf/SoftLinking.h>
>-
> @interface TUCall : NSObject
> @end
> 
>@@ -35,7 +32,4 @@
> + (NSString *)supplementalDialTelephonyCallString;
> @end
> 
>-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(TelephonyUtilities)
>-SOFT_LINK_CLASS(TelephonyUtilities, TUCall)
>-
> #endif
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 36fb7c11204..dcc7feb90a1 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/WebKit/Platform/mac/MenuUtilities.mm b/Source/WebKit/Platform/mac/MenuUtilities.mm
>index 82523b8c58d..cda8b0e902c 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 {
>-- 
>2.20.0 (Apple Git-115)
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193866: 360237 | 360238