Attachment 349074 Details for Bug 189370 – Patch

[patch] Patch

bug-189370-20180906143155.patch (text/plain), 4.10 KB, created by Daniel Bates on 2018-09-06 14:31:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-09-06 14:31:56 PDT

Size: 4.10 KB

patch

obsolete

>Subversion Revision: 235512
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0c4b25abbe1ff1f8455a1fb1aaec97a6bd303695..d5b53d91dd82dc3f2ef734c0e8cdb46ec6e68460 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        QuickLook.mm and QuickLookSoftLink.mm must never be built in the same unified source file
>+        https://bugs.webkit.org/show_bug.cgi?id=189370
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        QuickLookSoftLink.mm makes use of the soft-linking macros to soft link against QuickLook.
>+        These macros lead to a redefinition error when QuickLookSoftLink.mm and QuickLookSoftLink.h
>+        are included in the same translation unit. This can happen if the unified build system groups
>+        QuickLookSoftLink.mm with another implementation file that includes QuickLookSoftLink.h.
>+        In particular, the grouping of QuickLookSoftLink.mm and QuickLook.mm will cause this issue.
>+        Therefore, we exempt QuickLookSoftLink.mm from the list of files that compatible with
>+        unified sources so as to prevent such groupings.
>+
>+        * SourcesCocoa.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2018-09-06  Daniel Bates  <dabates@apple.com>
> 
>         [Xcode] Prefer system frameworks built into $(BUILT_PRODUCTS_DIR)/System/Library/Frameworks
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index 632be75a03000a1425edabab0211cd4f8aa6ad58..7523ef8c03e0a1d8c3ecdd699eb3e6fe34be7dfc 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -388,7 +388,6 @@ platform/ios/PlatformScreenIOS.mm
> platform/ios/PlatformSpeechSynthesizerIOS.mm @no-unify
> platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
> platform/ios/QuickLook.mm
>-platform/ios/QuickLookSoftLink.mm
> platform/ios/RemoteCommandListenerIOS.mm
> platform/ios/ScrollAnimatorIOS.mm
> platform/ios/ScrollbarThemeIOS.mm
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 17be5b7f3dd56b48abbf37559e0b88dee88b50e2..c93f47a789b7854fc76242615e696c1447b41b75 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -4098,6 +4098,7 @@
> 		CE1866451F72E5B400A0CAB6 /* MarkedText.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1866431F72E5B400A0CAB6 /* MarkedText.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CE2849871CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h in Headers */ = {isa = PBXBuildFile; fileRef = CE2849861CA360DF00B4A57F /* ContentSecurityPolicyDirectiveNames.h */; };
> 		CE4081D62141CDE8001B90AC /* PlatformEventFactoryIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 26601EBE14B3B9AD0012C0FE /* PlatformEventFactoryIOS.mm */; };
>+		CE4081DA2141CF8A001B90AC /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
> 		CE5FA255209E48C50051D700 /* ContentSecurityPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5FA253209E48C50051D700 /* ContentSecurityPolicyClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CE6DADFA1C591E6A003F6A88 /* ContentSecurityPolicyResponseHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = CE6DADF81C591E6A003F6A88 /* ContentSecurityPolicyResponseHeaders.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CE799F981C6A46BC0097B518 /* ContentSecurityPolicySourceList.h in Headers */ = {isa = PBXBuildFile; fileRef = CE799F961C6A46BC0097B518 /* ContentSecurityPolicySourceList.h */; };
>@@ -31434,6 +31435,7 @@
> 				AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */,
> 				CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
> 				CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
>+				CE4081DA2141CF8A001B90AC /* QuickLookSoftLink.mm in Sources */,
> 				419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
> 				316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
> 				BC51156E12B1749C00C96754 /* ScrollAnimatorMac.mm in Sources */,

Actions: View | Formatted Diff | Diff

Attachments on bug 189370: 349074