Attachment 358360 Details for Bug 193105 – patch

[patch] patch

patch (text/plain), 13.81 KB, created by Alex Christensen on 2019-01-04 13:43:08 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-04 13:43:08 PST

Size: 13.81 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239630)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-01-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards fixing Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=193105
>+
>+        Reviewed by Don Olmstead.
>+
>+        * PlatformMac.cmake:
>+        * Sources.txt:
>+        * SourcesCocoa.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * platform/graphics/gpu/GPURenderPassEncoder.h:
>+
> 2019-01-04  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Cocoa] Merge WebEditCommandProxy::nameForEditAction and undoNameForEditAction into a single function
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 239630)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -1,3 +1,4 @@
>+find_library(ACCELERATE_LIBRARY Accelerate)
> find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
> find_library(AVFOUNDATION_LIBRARY AVFoundation)
> find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
>@@ -25,6 +26,7 @@
> )
> 
> list(APPEND WebCore_LIBRARIES
>+    ${ACCELERATE_LIBRARY}
>     ${AUDIOTOOLBOX_LIBRARY}
>     ${AUDIOUNIT_LIBRARY}
>     ${AVFOUNDATION_LIBRARY}
>@@ -53,6 +55,11 @@
> add_definitions(-iframework ${CORESERVICES_LIBRARY}/Versions/Current/Frameworks)
> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
> 
>+find_library(COREUI_FRAMEWORK CoreUI HINTS /System/Library/PrivateFrameworks)
>+if (NOT COREUI_FRAMEWORK-NOTFOUND)
>+    list(APPEND WebCore_LIBRARIES ${COREUI_FRAMEWORK})
>+endif ()
>+
> find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
> if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
>     list(APPEND WebCore_LIBRARIES ${DATADETECTORSCORE_FRAMEWORK})
>Index: Source/WebCore/Sources.txt
>===================================================================
>--- Source/WebCore/Sources.txt	(revision 239630)
>+++ Source/WebCore/Sources.txt	(working copy)
>@@ -1677,6 +1677,7 @@
> platform/graphics/Gradient.cpp
> platform/graphics/GradientImage.cpp
> platform/graphics/GraphicsContext.cpp
>+platform/graphics/GraphicsContext3DManager.cpp
> platform/graphics/GraphicsContextImpl.cpp
> platform/graphics/GraphicsLayer.cpp
> platform/graphics/GraphicsLayerTransform.cpp
>Index: Source/WebCore/SourcesCocoa.txt
>===================================================================
>--- Source/WebCore/SourcesCocoa.txt	(revision 239630)
>+++ Source/WebCore/SourcesCocoa.txt	(working copy)
>@@ -249,6 +249,7 @@
> platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm @no-unify
> platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm @no-unify
> platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm @no-unify
>+platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm @no-unify
> platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp @no-unify
> platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm @no-unify
> platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm @no-unify
>@@ -278,6 +279,7 @@
> platform/graphics/cg/IOSurfacePool.cpp
> platform/graphics/cg/ImageBufferCG.cpp
> platform/graphics/cg/ImageBufferDataCG.cpp
>+platform/graphics/cg/ImageBufferUtilitiesCG.cpp
> platform/graphics/cg/ImageDecoderCG.cpp
> platform/graphics/cg/ImageSourceCGMac.mm
> platform/graphics/cg/IntPointCG.cpp
>@@ -352,6 +354,7 @@
> platform/graphics/mac/IntSizeMac.mm
> platform/graphics/mac/PDFDocumentImageMac.mm
> platform/graphics/mac/SimpleFontDataCoreText.cpp
>+platform/graphics/mac/SwitchingGPUClient.cpp
> platform/graphics/mac/WebLayer.mm
> platform/graphics/mac/WebKitNSImageExtras.mm
> 
>@@ -446,6 +449,7 @@
> platform/mac/KeyEventMac.mm @no-unify
> platform/mac/PlaybackSessionInterfaceMac.mm @no-unify
> platform/mac/LocalCurrentGraphicsContext.mm
>+platform/mac/LocalDefaultSystemAppearance.mm
> platform/mac/LoggingMac.mm
> platform/mac/MediaRemoteSoftLink.cpp
> platform/mac/NSScrollerImpDetails.mm
>Index: Source/WebCore/WebCore.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebCore/WebCore.xcodeproj/project.pbxproj	(revision 239630)
>+++ Source/WebCore/WebCore.xcodeproj/project.pbxproj	(working copy)
>@@ -1217,7 +1217,6 @@
> 		4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */; };
> 		445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		445775EA2047303C008DCE5D /* LocalDefaultSystemAppearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */; };
> 		4471710E205AF945000A116E /* MediaQueryParserContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4471710C205AF945000A116E /* MediaQueryParserContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3959,7 +3958,6 @@
> 		C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */ = {isa = PBXBuildFile; fileRef = C0F2A43F13869A280066C534 /* preprocessor.pm */; settings = {ATTRIBUTES = (Private, ); }; };
> 		C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */; };
> 		C11A9ECE21403A5C00CFB20A /* SwitchingGPUClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C11A9ECD21403A5C00CFB20A /* SwitchingGPUClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		C11A9ED32140578B00CFB20A /* SwitchingGPUClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C11A9ED22140578B00CFB20A /* SwitchingGPUClient.cpp */; };
> 		C1E1D236203DF15400584665 /* ScreenProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = C1E1D235203DF15400584665 /* ScreenProperties.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */; };
> 		C21DF2EA1D9E4E9900F5B24C /* CSSFontVariationValue.h in Headers */ = {isa = PBXBuildFile; fileRef = C21DF2E81D9E4E9900F5B24C /* CSSFontVariationValue.h */; };
>@@ -4062,7 +4060,6 @@
> 		CD54A763180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CD54A761180F9F7000B076C9 /* AudioTrackPrivateMediaSourceAVFObjC.h */; };
> 		CD5596911475B678001D0BD0 /* AudioFileReaderIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD55968F1475B678001D0BD0 /* AudioFileReaderIOS.cpp */; };
> 		CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5596901475B678001D0BD0 /* AudioFileReaderIOS.h */; };
>-		CD58949521874064004F424A /* ImageBufferUtilitiesCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD58949321874064004F424A /* ImageBufferUtilitiesCG.cpp */; };
> 		CD5896E21CD2B15100B3BCC8 /* WebPlaybackControlsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5896E01CD2B15100B3BCC8 /* WebPlaybackControlsManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		CD5D27781E8318E000D80A3D /* WebCoreDecompressionSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5D27761E8318E000D80A3D /* WebCoreDecompressionSession.h */; };
> 		CD5E5B5F1A15CE54000C609E /* PageConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5E5B5E1A15CE54000C609E /* PageConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -4223,7 +4220,6 @@
> 		D06C0D8F0CFD11460065F43F /* RemoveFormatCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = D06C0D8D0CFD11460065F43F /* RemoveFormatCommand.h */; };
> 		D07DEABA0A36554A00CA30F8 /* InsertListCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = D07DEAB80A36554A00CA30F8 /* InsertListCommand.h */; };
> 		D0843A4B20FEBE3D00FE860E /* GraphicsContext3DManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D0843A4A20FEBE3D00FE860E /* GraphicsContext3DManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		D0843A4D20FEC16500FE860E /* GraphicsContext3DManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0843A4C20FEC16500FE860E /* GraphicsContext3DManager.cpp */; };
> 		D086FE9809D53AAB005BC74D /* UnlinkCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = D086FE9609D53AAB005BC74D /* UnlinkCommand.h */; };
> 		D08B00E220A282490004BC0A /* WebGLCompressedTextureASTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0A20D562092A0A600E0C259 /* WebGLCompressedTextureASTC.cpp */; };
> 		D08B00E420A282590004BC0A /* WebGLCompressedTextureASTC.h in Headers */ = {isa = PBXBuildFile; fileRef = D0A20D542092A0A600E0C259 /* WebGLCompressedTextureASTC.h */; };
>@@ -32363,11 +32359,9 @@
> 				515BE1911D54F5FB00DD7C68 /* GamepadProvider.cpp in Sources */,
> 				837964CF1F8DB69D00218EA0 /* GeolocationPositionIOS.mm in Sources */,
> 				6E21C6C01126338500A7BE02 /* GraphicsContext3D.cpp in Sources */,
>-				D0843A4D20FEC16500FE860E /* GraphicsContext3DManager.cpp in Sources */,
> 				7C3E510B18DF8F3500C112F7 /* HTMLConverter.mm in Sources */,
> 				A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */,
> 				1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
>-				CD58949521874064004F424A /* ImageBufferUtilitiesCG.cpp in Sources */,
> 				CD19FEAF1F574B6D000C42FB /* ImageDecoderAVFObjC.mm in Sources */,
> 				BE961C5418AD338500D07DC5 /* InbandDataTextTrack.cpp in Sources */,
> 				BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */,
>@@ -32394,7 +32388,6 @@
> 				41D28D0D2139E05800F4206F /* LibWebRTCStatsCollector.cpp in Sources */,
> 				4186BD3E213EE3400001826F /* LibWebRTCUtils.cpp in Sources */,
> 				9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */,
>-				445775EA2047303C008DCE5D /* LocalDefaultSystemAppearance.mm in Sources */,
> 				FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */,
> 				2D9BF7051DBFBB24007A7D99 /* MediaEncryptedEvent.cpp in Sources */,
> 				2D9BF7471DBFDC49007A7D99 /* MediaKeyMessageEvent.cpp in Sources */,
>@@ -32451,7 +32444,6 @@
> 				538F10A81F9022A4005102CE /* SoftLinkLibxslt.cpp in Sources */,
> 				CDC8B5AA18047FF10016E685 /* SourceBufferPrivateAVFObjC.mm in Sources */,
> 				A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */,
>-				C11A9ED32140578B00CFB20A /* SwitchingGPUClient.cpp in Sources */,
> 				9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
> 				9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
> 				071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
>Index: Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h
>===================================================================
>--- Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h	(revision 239630)
>+++ Source/WebCore/platform/graphics/gpu/GPURenderPassEncoder.h	(working copy)
>@@ -28,6 +28,7 @@
> #if ENABLE(WEBGPU)
> 
> #include "GPUProgrammablePassEncoder.h"
>+#include "GPURenderPipeline.h"
> 
> #include <wtf/RefCounted.h>
> #include <wtf/RefPtr.h>
>@@ -40,7 +41,6 @@
> 
> class GPUBuffer;
> class GPUCommandBuffer;
>-class GPURenderPipeline;
> 
> struct GPURenderPassDescriptor;
> 
>Index: Source/WebKitLegacy/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 239630)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-01-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards fixing Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=193105
>+
>+        Reviewed by Don Olmstead.
>+
>+        * WebKitPrefix.h:
>+
> 2019-01-04  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [Cocoa] Merge WebEditCommandProxy::nameForEditAction and undoNameForEditAction into a single function
>Index: Source/WebKitLegacy/mac/WebKitPrefix.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebKitPrefix.h	(revision 239630)
>+++ Source/WebKitLegacy/mac/WebKitPrefix.h	(working copy)
>@@ -28,7 +28,10 @@
> 
> #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
> #include "cmakeconfig.h"
>+#ifndef JSC_API_AVAILABLE
>+#define JSC_API_AVAILABLE(...)
> #endif
>+#endif
> 
> #include <TargetConditionals.h>
> 
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239631)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,5 +1,14 @@
> 2019-01-04  Alex Christensen  <achristensen@webkit.org>
> 
>+        Progress towards fixing Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=193105
>+
>+        Reviewed by Don Olmstead.
>+
>+        * TestWebKitAPI/PlatformMac.cmake:
>+
>+2019-01-04  Alex Christensen  <achristensen@webkit.org>
>+
>         Deprecate WKContextCreate
>         https://bugs.webkit.org/show_bug.cgi?id=193118
> 
>Index: Tools/TestWebKitAPI/PlatformMac.cmake
>===================================================================
>--- Tools/TestWebKitAPI/PlatformMac.cmake	(revision 239630)
>+++ Tools/TestWebKitAPI/PlatformMac.cmake	(working copy)
>@@ -2,10 +2,12 @@
> set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
> 
> include_directories(
>-    ${FORWARDING_HEADERS_DIR}
>+    "${DERIVED_SOURCES_WTF_DIR}"
>+    "${FORWARDING_HEADERS_DIR}"
> )
> 
> set(test_main_SOURCES
>+    ${TESTWEBKITAPI_DIR}/cocoa/UtilitiesCocoa.mm
>     ${TESTWEBKITAPI_DIR}/mac/mainMac.mm
> )
>

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 193105: 358254 | 358360 | 358393