Fix CMake build.

Source/WebCore:

* platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
Some JavaScript inline functions were not being accessed from this file with different enable flags.
* platform/spi/cf/CFNetworkSPI.h:
* platform/spi/cocoa/NSURLConnectionSPI.h:
Moved NSURLSession-specific SPI from NSURLConnectionSPI.h to CFNetworkSPI.h.

Tools:

* TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm:
* TestRunnerShared/spi/CoreGraphicsSPI.h: Removed.
* TestRunnerShared/spi/CoreGraphicsTestSPI.h: Copied from Tools/TestRunnerShared/spi/CoreGraphicsSPI.h.
There is a CoreGraphicsSPI.h in WebCore and the CMake build was finding the wrong one.
Since we just inherit the include paths from WebCore in the CMake build and since this SPI is only used for testing,
I just renamed CoreGraphicsSPI.h to CoreGraphicsTestSPI.h to avoid any name collisions.
* WebKitTestRunner/PlatformMac.cmake:
Add some missing files.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@214946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e04d687..449a135 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2017-04-05  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build.
+
+        * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
+        Some JavaScript inline functions were not being accessed from this file with different enable flags.
+        * platform/spi/cf/CFNetworkSPI.h:
+        * platform/spi/cocoa/NSURLConnectionSPI.h:
+        Moved NSURLSession-specific SPI from NSURLConnectionSPI.h to CFNetworkSPI.h.
+
 2017-04-05  Chris Dumez  <cdumez@apple.com>
 
         _blank / _self / _parent / _top browsing context names should be case-insensitive

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm
index 17864ad..3b1a316 100644 (file)
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm
@@ -27,6 +27,7 @@
 #import "MediaSampleAVFObjC.h"
 
 #import "PixelBufferConformerCV.h"
+#import <runtime/JSCInlines.h>
 #import <runtime/TypedArrayInlines.h>
 #import <wtf/PrintStream.h>
 

diff --git a/Source/WebCore/platform/spi/cf/CFNetworkSPI.h b/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
index 961a4dd..c0b557e 100644 (file)
--- a/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
+++ b/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
@@ -120,6 +120,13 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
 @end
 #endif
 
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+@interface NSURLSessionTaskTransactionMetrics ()
+@property (copy, readonly) NSString* _remoteAddressAndPort;
+@property (copy, readonly) NSUUID* _connectionIdentifier;
+@end
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
 @interface NSHTTPCookie ()
 @property (nullable, readonly, copy) NSString *_storagePartition;

diff --git a/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h b/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
index c52edb8..2c66c5a 100644 (file)
--- a/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
+++ b/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h
@@ -46,11 +46,4 @@ typedef NSUInteger TimingDataCollection;
 - (NSDictionary *)_timingData;
 @end
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
-@interface NSURLSessionTaskTransactionMetrics ()
-@property (copy, readonly) NSString* _remoteAddressAndPort;
-@property (copy, readonly) NSUUID* _connectionIdentifier;
-@end
-#endif
-
 #endif

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7fbb024..b9f4103 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2017-04-05  Alex Christensen  <achristensen@webkit.org>
+
+        Fix CMake build.
+
+        * TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm:
+        * TestRunnerShared/spi/CoreGraphicsSPI.h: Removed.
+        * TestRunnerShared/spi/CoreGraphicsTestSPI.h: Copied from Tools/TestRunnerShared/spi/CoreGraphicsSPI.h.
+        There is a CoreGraphicsSPI.h in WebCore and the CMake build was finding the wrong one.
+        Since we just inherit the include paths from WebCore in the CMake build and since this SPI is only used for testing,
+        I just renamed CoreGraphicsSPI.h to CoreGraphicsTestSPI.h to avoid any name collisions.
+        * WebKitTestRunner/PlatformMac.cmake:
+        Add some missing files.
+        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+
 2017-04-05  Keith Miller  <keith_miller@apple.com>
 
         Add debug option to run-jsc script

diff --git a/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm b/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
index e675396..7c3e8ce 100644 (file)
--- a/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
+++ b/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
@@ -28,7 +28,7 @@
 
 #if PLATFORM(MAC)
 
-#import "CoreGraphicsSPI.h"
+#import "CoreGraphicsTestSPI.h"
 #import "IOKitSPI.h"
 #import <algorithm>
 #import <mach/mach_time.h>

diff --git a/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h b/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h
similarity index 100%
rename from Tools/TestRunnerShared/spi/CoreGraphicsSPI.h
rename to Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h

diff --git a/Tools/WebKitTestRunner/PlatformMac.cmake b/Tools/WebKitTestRunner/PlatformMac.cmake
index 6be8cd4..2f89ab0 100644 (file)
--- a/Tools/WebKitTestRunner/PlatformMac.cmake
+++ b/Tools/WebKitTestRunner/PlatformMac.cmake
@@ -71,6 +71,9 @@ list(APPEND WebKitTestRunner_SOURCES
     ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerEvent.mm
     ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerPasteboard.mm
     ${WEBKIT_TESTRUNNER_DIR}/mac/main.mm
+    
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
 )
 
 link_directories(../../WebKitLibraries)

diff --git a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
index 0b214ab..c0b2770 100644 (file)
--- a/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
+++ b/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
@@ -62,7 +62,7 @@
                29A8FCDD145F0337009045A6 /* JSAccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */; };
                29A8FCE2145F037B009045A6 /* AccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */; };
                29A8FCE5145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */; };
-               2DB6187E1D7D58D400978D19 /* CoreGraphicsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */; };
+               2DB6187E1D7D58D400978D19 /* CoreGraphicsTestSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */; };
                2DD4C49A1D6E7D3B0007379C /* EventSerializerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD4C4981D6E7D3B0007379C /* EventSerializerMac.h */; };
                2DD4C49B1D6E7D3B0007379C /* EventSerializerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD4C4991D6E7D3B0007379C /* EventSerializerMac.mm */; };
                2DFA98481D7F70CF00AFF2C9 /* SharedEventStreamsMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFA98461D7F70CF00AFF2C9 /* SharedEventStreamsMac.h */; };
@@ -243,7 +243,7 @@
                29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAccessibilityTextMarkerRange.cpp; sourceTree = "<group>"; };
                29A8FCE1345E7021006AA5A7 /* JSAccessibilityTextMarkerRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAccessibilityTextMarkerRange.h; sourceTree = "<group>"; };
                29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityTextMarkerRangeMac.mm; sourceTree = "<group>"; };
-               2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreGraphicsSPI.h; path = ../TestRunnerShared/spi/CoreGraphicsSPI.h; sourceTree = "<group>"; };
+               2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreGraphicsTestSPI.h; path = ../TestRunnerShared/spi/CoreGraphicsTestSPI.h; sourceTree = "<group>"; };
                2DCE2CD11B84524500C7F832 /* TestControllerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestControllerCocoa.mm; path = cocoa/TestControllerCocoa.mm; sourceTree = "<group>"; };
                2DD4C4981D6E7D3B0007379C /* EventSerializerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EventSerializerMac.h; path = mac/EventSerializerMac.h; sourceTree = "<group>"; };
                2DD4C4991D6E7D3B0007379C /* EventSerializerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EventSerializerMac.mm; path = mac/EventSerializerMac.mm; sourceTree = "<group>"; };
@@ -567,7 +567,7 @@
                2DB6187F1D7D598800978D19 /* spi */ = {
                        isa = PBXGroup;
                        children = (
-                               2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */,
+                               2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */,
                                0FEBF85B1BB62A370028722D /* IOKitSPI.h */,
                        );
                        name = spi;
@@ -805,7 +805,7 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               2DB6187E1D7D58D400978D19 /* CoreGraphicsSPI.h in Headers */,
+                               2DB6187E1D7D58D400978D19 /* CoreGraphicsTestSPI.h in Headers */,
                                0F73B5521BA78968004B3EF4 /* JSUIScriptController.h in Headers */,
                                2DFA98481D7F70CF00AFF2C9 /* SharedEventStreamsMac.h in Headers */,
                                2DD4C49A1D6E7D3B0007379C /* EventSerializerMac.h in Headers */,