Diff
Modified: trunk/Source/WebCore/ChangeLog (214945 => 214946)
--- trunk/Source/WebCore/ChangeLog 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 16:06:49 UTC (rev 214946)
@@ -1,3 +1,13 @@
+2017-04-05 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
_blank / _self / _parent / _top browsing context names should be case-insensitive
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm (214945 => 214946)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2017-04-05 16:06:49 UTC (rev 214946)
@@ -27,6 +27,7 @@
#import "MediaSampleAVFObjC.h"
#import "PixelBufferConformerCV.h"
+#import <runtime/JSCInlines.h>
#import <runtime/TypedArrayInlines.h>
#import <wtf/PrintStream.h>
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (214945 => 214946)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-05 16:06:49 UTC (rev 214946)
@@ -120,6 +120,13 @@
@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;
Modified: trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h (214945 => 214946)
--- trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2017-04-05 16:06:49 UTC (rev 214946)
@@ -46,11 +46,4 @@
- (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
Modified: trunk/Tools/ChangeLog (214945 => 214946)
--- trunk/Tools/ChangeLog 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Tools/ChangeLog 2017-04-05 16:06:49 UTC (rev 214946)
@@ -1,3 +1,17 @@
+2017-04-05 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Add debug option to run-jsc script
Modified: trunk/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm (214945 => 214946)
--- trunk/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm 2017-04-05 16:06:49 UTC (rev 214946)
@@ -28,7 +28,7 @@
#if PLATFORM(MAC)
-#import "CoreGraphicsSPI.h"
+#import "CoreGraphicsTestSPI.h"
#import "IOKitSPI.h"
#import <algorithm>
#import <mach/mach_time.h>
Deleted: trunk/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h (214945 => 214946)
--- trunk/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h 2017-04-05 16:06:49 UTC (rev 214946)
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#pragma once
-
-#import <wtf/Platform.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <CoreGraphics/CGEventPrivate.h>
-#import <CoreGraphics/CGSEvent.h>
-
-#else
-
-WTF_EXTERN_C_BEGIN
-
-static const CGEventField kCGSEventWindowIDField = (CGEventField)51;
-static const CGEventField kCGSEventTypeField = (CGEventField)55;
-static const CGEventField kCGEventGestureHIDType = (CGEventField)110;
-static const CGEventField kCGEventGestureIsPreflight = (CGEventField)111;
-static const CGEventField kCGEventGestureZoomValue = (CGEventField)113;
-static const CGEventField kCGEventGestureRotationValue = (CGEventField)114;
-static const CGEventField kCGEventGestureSwipeValue = (CGEventField)115;
-static const CGEventField kCGEventGesturePreflightProgress = (CGEventField)116;
-static const CGEventField kCGEventGestureStartEndSeriesType = (CGEventField)117;
-static const CGEventField kCGEventGestureScrollX = (CGEventField)118;
-static const CGEventField kCGEventGestureScrollY = (CGEventField)119;
-static const CGEventField kCGEventGestureScrollZ = (CGEventField)120;
-static const CGEventField kCGEventGestureSwipeMotion = (CGEventField)123;
-static const CGEventField kCGEventGestureSwipeProgress = (CGEventField)124;
-static const CGEventField kCGEventGestureSwipePositionX = (CGEventField)125;
-static const CGEventField kCGEventGestureSwipePositionY = (CGEventField)126;
-static const CGEventField kCGEventGestureSwipeVelocityX = (CGEventField)129;
-static const CGEventField kCGEventGestureSwipeVelocityY = (CGEventField)130;
-static const CGEventField kCGEventGestureSwipeVelocityZ = (CGEventField)131;
-static const CGEventField kCGEventGesturePhase = (CGEventField)132;
-static const CGEventField kCGEventGestureMask = (CGEventField)133;
-static const CGEventField kCGEventGestureSwipeMask = (CGEventField)134;
-static const CGEventField kCGEventScrollGestureFlagBits = (CGEventField)135;
-static const CGEventField kCGEventSwipeGestureFlagBits = (CGEventField)136;
-static const CGEventField kCGEventGestureFlavor = (CGEventField)138;
-static const CGEventField kCGEventGestureZoomDeltaX = (CGEventField)139;
-static const CGEventField kCGEventGestureZoomDeltaY = (CGEventField)140;
-static const CGEventField kCGEventGestureProgress = (CGEventField)142;
-static const CGEventField kCGEventGestureStage = (CGEventField)143;
-static const CGEventField kCGEventGestureBehavior = (CGEventField)144;
-static const CGEventField kCGEventTransitionProgress = (CGEventField)147;
-static const CGEventField kCGEventStagePressure = (CGEventField)148;
-
-enum {
- kCGSEventScrollWheel = 22,
- kCGSEventZoom = 28,
- kCGSEventGesture = 29,
- kCGSEventDockControl = 30,
- kCGSEventFluidTouchGesture = 31,
-};
-typedef uint32_t CGSEventType;
-
-enum {
- kCGHIDEventTypeGestureStarted = 61,
- kCGHIDEventTypeGestureEnded = 62,
-};
-typedef uint32_t CGSHIDEventType;
-
-CGPoint CGEventGetWindowLocation(CGEventRef);
-void CGEventSetWindowLocation(CGEventRef, CGPoint);
-
-WTF_EXTERN_C_END
-
-#endif // USE(APPLE_INTERNAL_SDK)
Copied: trunk/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h (from rev 214945, trunk/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h) (0 => 214946)
--- trunk/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h (rev 0)
+++ trunk/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h 2017-04-05 16:06:49 UTC (rev 214946)
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+#pragma once
+
+#import <wtf/Platform.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <CoreGraphics/CGEventPrivate.h>
+#import <CoreGraphics/CGSEvent.h>
+
+#else
+
+WTF_EXTERN_C_BEGIN
+
+static const CGEventField kCGSEventWindowIDField = (CGEventField)51;
+static const CGEventField kCGSEventTypeField = (CGEventField)55;
+static const CGEventField kCGEventGestureHIDType = (CGEventField)110;
+static const CGEventField kCGEventGestureIsPreflight = (CGEventField)111;
+static const CGEventField kCGEventGestureZoomValue = (CGEventField)113;
+static const CGEventField kCGEventGestureRotationValue = (CGEventField)114;
+static const CGEventField kCGEventGestureSwipeValue = (CGEventField)115;
+static const CGEventField kCGEventGesturePreflightProgress = (CGEventField)116;
+static const CGEventField kCGEventGestureStartEndSeriesType = (CGEventField)117;
+static const CGEventField kCGEventGestureScrollX = (CGEventField)118;
+static const CGEventField kCGEventGestureScrollY = (CGEventField)119;
+static const CGEventField kCGEventGestureScrollZ = (CGEventField)120;
+static const CGEventField kCGEventGestureSwipeMotion = (CGEventField)123;
+static const CGEventField kCGEventGestureSwipeProgress = (CGEventField)124;
+static const CGEventField kCGEventGestureSwipePositionX = (CGEventField)125;
+static const CGEventField kCGEventGestureSwipePositionY = (CGEventField)126;
+static const CGEventField kCGEventGestureSwipeVelocityX = (CGEventField)129;
+static const CGEventField kCGEventGestureSwipeVelocityY = (CGEventField)130;
+static const CGEventField kCGEventGestureSwipeVelocityZ = (CGEventField)131;
+static const CGEventField kCGEventGesturePhase = (CGEventField)132;
+static const CGEventField kCGEventGestureMask = (CGEventField)133;
+static const CGEventField kCGEventGestureSwipeMask = (CGEventField)134;
+static const CGEventField kCGEventScrollGestureFlagBits = (CGEventField)135;
+static const CGEventField kCGEventSwipeGestureFlagBits = (CGEventField)136;
+static const CGEventField kCGEventGestureFlavor = (CGEventField)138;
+static const CGEventField kCGEventGestureZoomDeltaX = (CGEventField)139;
+static const CGEventField kCGEventGestureZoomDeltaY = (CGEventField)140;
+static const CGEventField kCGEventGestureProgress = (CGEventField)142;
+static const CGEventField kCGEventGestureStage = (CGEventField)143;
+static const CGEventField kCGEventGestureBehavior = (CGEventField)144;
+static const CGEventField kCGEventTransitionProgress = (CGEventField)147;
+static const CGEventField kCGEventStagePressure = (CGEventField)148;
+
+enum {
+ kCGSEventScrollWheel = 22,
+ kCGSEventZoom = 28,
+ kCGSEventGesture = 29,
+ kCGSEventDockControl = 30,
+ kCGSEventFluidTouchGesture = 31,
+};
+typedef uint32_t CGSEventType;
+
+enum {
+ kCGHIDEventTypeGestureStarted = 61,
+ kCGHIDEventTypeGestureEnded = 62,
+};
+typedef uint32_t CGSHIDEventType;
+
+CGPoint CGEventGetWindowLocation(CGEventRef);
+void CGEventSetWindowLocation(CGEventRef, CGPoint);
+
+WTF_EXTERN_C_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (214945 => 214946)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-05 16:06:49 UTC (rev 214946)
@@ -71,6 +71,9 @@
${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)
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (214945 => 214946)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-04-05 14:28:57 UTC (rev 214945)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-04-05 16:06:49 UTC (rev 214946)
@@ -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 */,
