<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215128] tags/Safari-604.1.16.1</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215128">215128</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-04-07 16:25:12 -0700 (Fri, 07 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/214946">r214946</a>. rdar://problem/31472278</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6041161SourceWebCoreChangeLog">tags/Safari-604.1.16.1/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari6041161SourceWebCoreplatformgraphicsavfoundationobjcMediaSampleAVFObjCmm">tags/Safari-604.1.16.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm</a></li>
<li><a href="#tagsSafari6041161SourceWebCoreplatformspicfCFNetworkSPIh">tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#tagsSafari6041161SourceWebCoreplatformspicocoaNSURLConnectionSPIh">tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h</a></li>
<li><a href="#tagsSafari6041161ToolsChangeLog">tags/Safari-604.1.16.1/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari6041161ToolsTestRunnerSharedEventSerializationmacEventSerializerMacmm">tags/Safari-604.1.16.1/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm</a></li>
<li><a href="#tagsSafari6041161ToolsWebKitTestRunnerPlatformMaccmake">tags/Safari-604.1.16.1/Tools/WebKitTestRunner/PlatformMac.cmake</a></li>
<li><a href="#tagsSafari6041161ToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj">tags/Safari-604.1.16.1/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari6041161ToolsTestRunnerSharedspiCoreGraphicsTestSPIh">tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari6041161ToolsTestRunnerSharedspiCoreGraphicsSPIh">tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6041161SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Source/WebCore/ChangeLog (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Source/WebCore/ChangeLog 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Source/WebCore/ChangeLog 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-04-07 Jason Marcell <jmarcell@apple.com>
+
+ Cherry-pick r214946. rdar://problem/31472278
+
+ 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.
+
</ins><span class="cx"> 2017-04-04 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Move AVSampleBufferDisplayLayer declarations into AVFoundationSPI.h
</span></span></pre></div>
<a id="tagsSafari6041161SourceWebCoreplatformgraphicsavfoundationobjcMediaSampleAVFObjCmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "MediaSampleAVFObjC.h"
</span><span class="cx">
</span><span class="cx"> #import "PixelBufferConformerCV.h"
</span><ins>+#import <runtime/JSCInlines.h>
</ins><span class="cx"> #import <runtime/TypedArrayInlines.h>
</span><span class="cx"> #import <wtf/PrintStream.h>
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6041161SourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -120,6 +120,13 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
</span><span class="cx"> @interface NSHTTPCookie ()
</span><span class="cx"> @property (nullable, readonly, copy) NSString *_storagePartition;
</span></span></pre></div>
<a id="tagsSafari6041161SourceWebCoreplatformspicocoaNSURLConnectionSPIh"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Source/WebCore/platform/spi/cocoa/NSURLConnectionSPI.h 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -46,11 +46,4 @@
</span><span class="cx"> - (NSDictionary *)_timingData;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> #endif
</span><del>-
-#endif
</del></span></pre></div>
<a id="tagsSafari6041161ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Tools/ChangeLog (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/ChangeLog 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Tools/ChangeLog 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-04-07 Jason Marcell <jmarcell@apple.com>
+
+ Cherry-pick r214946. rdar://problem/31472278
+
+ 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:
+
</ins><span class="cx"> 2017-04-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Various settings in Minibrowser are off by default, and should be on
</span></span></pre></div>
<a id="tagsSafari6041161ToolsTestRunnerSharedEventSerializationmacEventSerializerMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-#import "CoreGraphicsSPI.h"
</del><ins>+#import "CoreGraphicsTestSPI.h"
</ins><span class="cx"> #import "IOKitSPI.h"
</span><span class="cx"> #import <algorithm>
</span><span class="cx"> #import <mach/mach_time.h>
</span></span></pre></div>
<a id="tagsSafari6041161ToolsTestRunnerSharedspiCoreGraphicsSPIh"></a>
<div class="delfile"><h4>Deleted: tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -1,92 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="tagsSafari6041161ToolsTestRunnerSharedspiCoreGraphicsTestSPIhfromrev215127tagsSafari6041161ToolsTestRunnerSharedspiCoreGraphicsSPIh"></a>
<div class="copfile"><h4>Copied: tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h (from rev 215127, tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsSPI.h) (0 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h (rev 0)
+++ tags/Safari-604.1.16.1/Tools/TestRunnerShared/spi/CoreGraphicsTestSPI.h 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+/*
+ * 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)
</ins></span></pre></div>
<a id="tagsSafari6041161ToolsWebKitTestRunnerPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Tools/WebKitTestRunner/PlatformMac.cmake (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Tools/WebKitTestRunner/PlatformMac.cmake 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -71,6 +71,9 @@
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerEvent.mm
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/mac/WebKitTestRunnerPasteboard.mm
</span><span class="cx"> ${WEBKIT_TESTRUNNER_DIR}/mac/main.mm
</span><ins>+
+ ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
+ ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> link_directories(../../WebKitLibraries)
</span></span></pre></div>
<a id="tagsSafari6041161ToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.16.1/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (215127 => 215128)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.16.1/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-04-07 23:25:08 UTC (rev 215127)
+++ tags/Safari-604.1.16.1/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-04-07 23:25:12 UTC (rev 215128)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> 29A8FCDD145F0337009045A6 /* JSAccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */; };
</span><span class="cx"> 29A8FCE2145F037B009045A6 /* AccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */; };
</span><span class="cx"> 29A8FCE5145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */; };
</span><del>- 2DB6187E1D7D58D400978D19 /* CoreGraphicsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */; };
</del><ins>+ 2DB6187E1D7D58D400978D19 /* CoreGraphicsTestSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */; };
</ins><span class="cx"> 2DD4C49A1D6E7D3B0007379C /* EventSerializerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD4C4981D6E7D3B0007379C /* EventSerializerMac.h */; };
</span><span class="cx"> 2DD4C49B1D6E7D3B0007379C /* EventSerializerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD4C4991D6E7D3B0007379C /* EventSerializerMac.mm */; };
</span><span class="cx"> 2DFA98481D7F70CF00AFF2C9 /* SharedEventStreamsMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFA98461D7F70CF00AFF2C9 /* SharedEventStreamsMac.h */; };
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> 29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAccessibilityTextMarkerRange.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 29A8FCE1345E7021006AA5A7 /* JSAccessibilityTextMarkerRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAccessibilityTextMarkerRange.h; sourceTree = "<group>"; };
</span><span class="cx"> 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityTextMarkerRangeMac.mm; sourceTree = "<group>"; };
</span><del>- 2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreGraphicsSPI.h; path = ../TestRunnerShared/spi/CoreGraphicsSPI.h; sourceTree = "<group>"; };
</del><ins>+ 2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreGraphicsTestSPI.h; path = ../TestRunnerShared/spi/CoreGraphicsTestSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 2DCE2CD11B84524500C7F832 /* TestControllerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestControllerCocoa.mm; path = cocoa/TestControllerCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DD4C4981D6E7D3B0007379C /* EventSerializerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EventSerializerMac.h; path = mac/EventSerializerMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DD4C4991D6E7D3B0007379C /* EventSerializerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EventSerializerMac.mm; path = mac/EventSerializerMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx"> 2DB6187F1D7D598800978D19 /* spi */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 2DB6187D1D7D58D400978D19 /* CoreGraphicsSPI.h */,
</del><ins>+ 2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */,
</ins><span class="cx"> 0FEBF85B1BB62A370028722D /* IOKitSPI.h */,
</span><span class="cx"> );
</span><span class="cx"> name = spi;
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 2DB6187E1D7D58D400978D19 /* CoreGraphicsSPI.h in Headers */,
</del><ins>+ 2DB6187E1D7D58D400978D19 /* CoreGraphicsTestSPI.h in Headers */,
</ins><span class="cx"> 0F73B5521BA78968004B3EF4 /* JSUIScriptController.h in Headers */,
</span><span class="cx"> 2DFA98481D7F70CF00AFF2C9 /* SharedEventStreamsMac.h in Headers */,
</span><span class="cx"> 2DD4C49A1D6E7D3B0007379C /* EventSerializerMac.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>