<!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>[178927] trunk/Source</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/178927">178927</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 11:27:25 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Fix iphoneos SDK builds for ios-ews queue
<http://webkit.org/b/140748>
Reviewed by Daniel Bates.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Add new SPI headers.
* platform/graphics/cg/ImageBufferCG.cpp: Switch to using
"IOSurfaceSPI.h" from <IOSurface/IOSurface.h>.
* platform/graphics/cg/ImageBufferDataCG.cpp: Ditto.
* platform/graphics/cocoa/IOSurface.mm: Ditto. Move definitions
in <IOSurface/IOSurfacePrivate.h> into "IOSurfaceSPI.h".
* platform/spi/cg/CoreGraphicsSPI.h: Switch to
WTF_EXTERN_C_{BEGIN,END}. Add
CGContextGetFontAntialiasingStyle() and
CGContextSetFontAntialiasingStyle().
* platform/spi/cocoa/IOPMLibSPI.h: Switch to use IOReturnSPI.h.
* platform/spi/cocoa/IOReturnSPI.h: Add.
* platform/spi/cocoa/IOSurfaceSPI.h: Add.
* platform/spi/cocoa/IOTypesSPI.h: Add.
Source/WebKit2:
* Platform/spi/ios/BKSProcessAssertionSPI.h: Add -invalidate
definition. Sort @property to the top of BKSProcessAssertion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicgCoreGraphicsSPIh">trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaIOPMLibSPIh">trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosBKSProcessAssertionSPIh">trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicocoaIOReturnSPIh">trunk/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaIOSurfaceSPIh">trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaIOTypesSPIh">trunk/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/ChangeLog 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-22 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Fix iphoneos SDK builds for ios-ews queue
+ <http://webkit.org/b/140748>
+
+ Reviewed by Daniel Bates.
+
+ * WebCore.xcodeproj/project.pbxproj: Add new SPI headers.
+ * platform/graphics/cg/ImageBufferCG.cpp: Switch to using
+ "IOSurfaceSPI.h" from <IOSurface/IOSurface.h>.
+ * platform/graphics/cg/ImageBufferDataCG.cpp: Ditto.
+ * platform/graphics/cocoa/IOSurface.mm: Ditto. Move definitions
+ in <IOSurface/IOSurfacePrivate.h> into "IOSurfaceSPI.h".
+ * platform/spi/cg/CoreGraphicsSPI.h: Switch to
+ WTF_EXTERN_C_{BEGIN,END}. Add
+ CGContextGetFontAntialiasingStyle() and
+ CGContextSetFontAntialiasingStyle().
+ * platform/spi/cocoa/IOPMLibSPI.h: Switch to use IOReturnSPI.h.
+ * platform/spi/cocoa/IOReturnSPI.h: Add.
+ * platform/spi/cocoa/IOSurfaceSPI.h: Add.
+ * platform/spi/cocoa/IOTypesSPI.h: Add.
+
</ins><span class="cx"> 2015-01-21 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Skip items spanning flex tracks when sizing content based tracks
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -1626,6 +1626,9 @@
</span><span class="cx"> 44C991A00F3D210E00586670 /* ThemeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 44C9919E0F3D210E00586670 /* ThemeIOS.mm */; };
</span><span class="cx"> 44DAB5B115A623580097C1E4 /* Extensions3DOpenGLCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */; };
</span><span class="cx"> 44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */; };
</span><ins>+ 44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */; };
+ 44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */; };
+ 44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */; };
</ins><span class="cx"> 45099C411370A7800058D513 /* IconURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45099C401370A7800058D513 /* IconURL.cpp */; };
</span><span class="cx"> 450CEBF015073BBE002BB149 /* LabelableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 450CEBEE15073BBE002BB149 /* LabelableElement.cpp */; };
</span><span class="cx"> 450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 450CEBEF15073BBE002BB149 /* LabelableElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8690,6 +8693,9 @@
</span><span class="cx"> 44D8DA9A139545CD00337B75 /* SVGAnimateMotionElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAnimateMotionElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 44DAB5AF15A623580097C1E4 /* Extensions3DOpenGLCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Extensions3DOpenGLCommon.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 44DAB5B015A623580097C1E4 /* Extensions3DOpenGLCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Extensions3DOpenGLCommon.h; sourceTree = "<group>"; };
</span><ins>+ 44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOReturnSPI.h; sourceTree = "<group>"; };
+ 44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOSurfaceSPI.h; sourceTree = "<group>"; };
+ 44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOTypesSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 45099C401370A7800058D513 /* IconURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconURL.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 450CEBEE15073BBE002BB149 /* LabelableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelableElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 450CEBEF15073BBE002BB149 /* LabelableElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelableElement.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16234,6 +16240,9 @@
</span><span class="cx"> CE12524A1A16C79B00864480 /* DispatchSPI.h */,
</span><span class="cx"> CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
</span><span class="cx"> CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
</span><ins>+ 44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
+ 44DFF6421A6FF92700D45EEC /* IOSurfaceSPI.h */,
+ 44EFF6421A6FF92700D45EEC /* IOTypesSPI.h */,
</ins><span class="cx"> CE12524E1A1A78D200864480 /* MachVMSPI.h */,
</span><span class="cx"> CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */,
</span><span class="cx"> 2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */,
</span><span class="lines">@@ -24699,8 +24708,11 @@
</span><span class="cx"> B27535750B053814002CE64F /* IntSize.h in Headers */,
</span><span class="cx"> B27535760B053814002CE64F /* IntSizeHash.h in Headers */,
</span><span class="cx"> CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */,
</span><ins>+ 44DEF6431A6FF92700D45EEC /* IOReturnSPI.h in Headers */,
</ins><span class="cx"> 2D0B4AAB18DA1CCD00434DE1 /* IOSurface.h in Headers */,
</span><span class="cx"> 1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */,
</span><ins>+ 44DFF6431A6FF92700D45EEC /* IOSurfaceSPI.h in Headers */,
+ 44EFF6431A6FF92700D45EEC /* IOTypesSPI.h in Headers */,
</ins><span class="cx"> 07AC47021952102100EE9723 /* ISOVTTCue.h in Headers */,
</span><span class="cx"> 418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
</span><span class="cx"> 0705851B17FB44B4005F2BCB /* JSAllAudioCapabilities.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> #include "IOSurface.h"
</span><del>-#include <IOSurface/IOSurface.h>
</del><ins>+#include "IOSurfaceSPI.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // CA uses ARGB32 for textures and ARGB32 -> ARGB32 resampling is optimized.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>-#include <IOSurface/IOSurface.h>
</del><ins>+#include "IOSurfaceSPI.h"
</ins><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -30,25 +30,13 @@
</span><span class="cx">
</span><span class="cx"> #import "GraphicsContextCG.h"
</span><span class="cx"> #import "IOSurfacePool.h"
</span><ins>+#import "IOSurfaceSPI.h"
</ins><span class="cx"> #import "MachSendRight.h"
</span><del>-#import <IOSurface/IOSurface.h>
</del><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><del>-#if __has_include(<IOSurface/IOSurfacePrivate.h>)
-#import <IOSurface/IOSurfacePrivate.h>
-#else
-enum {
- kIOSurfacePurgeableNonVolatile = 0,
- kIOSurfacePurgeableVolatile = 1,
- kIOSurfacePurgeableEmpty = 2,
- kIOSurfacePurgeableKeepCurrent = 3,
-};
-#endif
-
</del><span class="cx"> extern "C" {
</span><span class="cx"> CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
</span><span class="cx"> CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
</span><del>-IOReturn IOSurfaceSetPurgeable(IOSurfaceRef, uint32_t, uint32_t *);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicgCoreGraphicsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -112,43 +112,50 @@
</span><span class="cx">
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-EXTERN_C CGColorRef CGColorTransformConvertColor(CGColorTransformRef, CGColorRef, CGColorRenderingIntent);
-EXTERN_C CGColorTransformRef CGColorTransformCreate(CGColorSpaceRef, CFDictionaryRef attributes);
</del><ins>+WTF_EXTERN_C_BEGIN
</ins><span class="cx">
</span><del>-EXTERN_C CGAffineTransform CGContextGetBaseCTM(CGContextRef);
-EXTERN_C CGCompositeOperation CGContextGetCompositeOperation(CGContextRef);
-EXTERN_C CGColorRef CGContextGetFillColorAsColor(CGContextRef);
-EXTERN_C CGFloat CGContextGetLineWidth(CGContextRef);
-EXTERN_C bool CGContextGetShouldSmoothFonts(CGContextRef);
-EXTERN_C void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
-EXTERN_C void CGContextSetCTM(CGContextRef, CGAffineTransform);
-EXTERN_C void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
-EXTERN_C void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
</del><ins>+CGColorRef CGColorTransformConvertColor(CGColorTransformRef, CGColorRef, CGColorRenderingIntent);
+CGColorTransformRef CGColorTransformCreate(CGColorSpaceRef, CFDictionaryRef attributes);
</ins><span class="cx">
</span><del>-EXTERN_C CFStringRef CGFontCopyFamilyName(CGFontRef);
-EXTERN_C bool CGFontGetDescriptor(CGFontRef, CGFontDescriptor*);
-EXTERN_C bool CGFontGetGlyphAdvancesForStyle(CGFontRef, const CGAffineTransform* , CGFontRenderingStyle, const CGGlyph[], size_t count, CGSize advances[]);
-EXTERN_C void CGFontGetGlyphsForUnichars(CGFontRef, const UniChar[], CGGlyph[], size_t count);
-EXTERN_C const CGFontHMetrics* CGFontGetHMetrics(CGFontRef);
-EXTERN_C const char* CGFontGetPostScriptName(CGFontRef);
-EXTERN_C bool CGFontIsFixedPitch(CGFontRef);
-EXTERN_C void CGFontSetShouldUseMulticache(bool);
</del><ins>+CGAffineTransform CGContextGetBaseCTM(CGContextRef);
+CGCompositeOperation CGContextGetCompositeOperation(CGContextRef);
+CGColorRef CGContextGetFillColorAsColor(CGContextRef);
+CGFloat CGContextGetLineWidth(CGContextRef);
+bool CGContextGetShouldSmoothFonts(CGContextRef);
+void CGContextSetBaseCTM(CGContextRef, CGAffineTransform);
+void CGContextSetCTM(CGContextRef, CGAffineTransform);
+void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
+void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
</ins><span class="cx">
</span><del>-EXTERN_C void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
-EXTERN_C CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
</del><ins>+CFStringRef CGFontCopyFamilyName(CGFontRef);
+bool CGFontGetDescriptor(CGFontRef, CGFontDescriptor*);
+bool CGFontGetGlyphAdvancesForStyle(CGFontRef, const CGAffineTransform* , CGFontRenderingStyle, const CGGlyph[], size_t count, CGSize advances[]);
+void CGFontGetGlyphsForUnichars(CGFontRef, const UniChar[], CGGlyph[], size_t count);
+const CGFontHMetrics* CGFontGetHMetrics(CGFontRef);
+const char* CGFontGetPostScriptName(CGFontRef);
+bool CGFontIsFixedPitch(CGFontRef);
+void CGFontSetShouldUseMulticache(bool);
</ins><span class="cx">
</span><del>-EXTERN_C CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
</del><ins>+void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
+CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
</ins><span class="cx">
</span><ins>+CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
+
+CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
+void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>-EXTERN_C CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
-EXTERN_C CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
-EXTERN_C CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
</del><ins>+CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
+CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
+CGError CGSReleaseRegionEnumerator(const CGSRegionEnumeratorObj);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-EXTERN_C CGFontCache* CGFontCacheGetLocalCache();
-EXTERN_C void CGFontCacheSetShouldAutoExpire(CGFontCache*, bool);
-EXTERN_C void CGFontCacheSetMaxSize(CGFontCache*, size_t);
</del><ins>+CGFontCache* CGFontCacheGetLocalCache();
+void CGFontCacheSetShouldAutoExpire(CGFontCache*, bool);
+void CGFontCacheSetMaxSize(CGFontCache*, size_t);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+WTF_EXTERN_C_END
+
</ins><span class="cx"> #endif // CoreGraphicsSPI_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaIOPMLibSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -34,9 +34,8 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-#include <mach/kern_return.h>
</del><ins>+#include "IOReturnSPI.h"
</ins><span class="cx">
</span><del>-typedef kern_return_t IOReturn;
</del><span class="cx"> typedef uint32_t IOPMAssertionID;
</span><span class="cx">
</span><span class="cx"> EXTERN_C const CFStringRef kIOPMAssertionTypePreventUserIdleDisplaySleep = CFSTR("PreventUserIdleDisplaySleep");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaIOReturnSPIhfromrev178926trunkSourceWebCoreplatformspicocoaIOPMLibSPIh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h (from rev 178926, trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h) (0 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOReturnSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef IOReturnSPI_h
+#define IOReturnSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOKit/IOReturn.h>
+
+#else
+
+#include <mach/kern_return.h>
+
+typedef kern_return_t IOReturn;
+
+#endif
+
+#endif // IOReturnSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaIOSurfaceSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (0 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef IOSurfaceSPI_h
+#define IOSurfaceSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOSurface/IOSurface.h>
+
+#else
+
+#include "IOReturnSPI.h"
+#include "IOTypesSPI.h"
+#include <CoreFoundation/CFBase.h>
+#include <mach/mach_port.h>
+
+typedef struct __IOSurface *IOSurfaceRef;
+
+enum {
+ kIOSurfaceLockReadOnly = 0x00000001,
+};
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+extern const CFStringRef kIOSurfaceAllocSize;
+extern const CFStringRef kIOSurfaceBytesPerElement;
+extern const CFStringRef kIOSurfaceBytesPerRow;
+extern const CFStringRef kIOSurfaceCacheMode;
+extern const CFStringRef kIOSurfaceHeight;
+extern const CFStringRef kIOSurfacePixelFormat;
+extern const CFStringRef kIOSurfaceWidth;
+
+size_t IOSurfaceAlignProperty(CFStringRef property, size_t value);
+IOSurfaceRef IOSurfaceCreate(CFDictionaryRef properties);
+mach_port_t IOSurfaceCreateMachPort(IOSurfaceRef buffer);
+size_t IOSurfaceGetAllocSize(IOSurfaceRef buffer);
+void *IOSurfaceGetBaseAddress(IOSurfaceRef buffer);
+size_t IOSurfaceGetBytesPerRow(IOSurfaceRef buffer);
+size_t IOSurfaceGetHeight(IOSurfaceRef buffer);
+size_t IOSurfaceGetPropertyMaximum(CFStringRef property);
+size_t IOSurfaceGetWidth(IOSurfaceRef buffer);
+Boolean IOSurfaceIsInUse(IOSurfaceRef buffer);
+IOReturn IOSurfaceLock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
+IOSurfaceRef IOSurfaceLookupFromMachPort(mach_port_t);
+IOReturn IOSurfaceUnlock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
+
+WTF_EXTERN_C_END
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <IOSurface/IOSurfacePrivate.h>
+
+#else
+
+enum {
+ kIOSurfacePurgeableNonVolatile = 0,
+ kIOSurfacePurgeableVolatile = 1,
+ kIOSurfacePurgeableEmpty = 2,
+ kIOSurfacePurgeableKeepCurrent = 3,
+};
+
+#endif
+
+WTF_EXTERN_C_BEGIN
+
+IOReturn IOSurfaceSetPurgeable(IOSurfaceRef buffer, uint32_t newState, uint32_t *oldState);
+
+WTF_EXTERN_C_END
+
+#endif // IOSurfaceSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaIOTypesSPIhfromrev178926trunkSourceWebCoreplatformspicocoaIOPMLibSPIh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h (from rev 178926, trunk/Source/WebCore/platform/spi/cocoa/IOPMLibSPI.h) (0 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/IOTypesSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef IOTypesSPI_h
+#define IOTypesSPI_h
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#include <IOKit/IOTypes.h>
+
+#else
+
+enum {
+ kIOWriteCombineCache = 4,
+};
+
+enum {
+ kIOMapCacheShift = 8,
+ kIOMapWriteCombineCache = kIOWriteCombineCache << kIOMapCacheShift,
+};
+
+#endif
+
+#endif // IOTypesSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-22 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Fix iphoneos SDK builds for ios-ews queue
+ <http://webkit.org/b/140748>
+
+ Reviewed by Daniel Bates.
+
+ * Platform/spi/ios/BKSProcessAssertionSPI.h: Add -invalidate
+ definition. Sort @property to the top of BKSProcessAssertion.
+
</ins><span class="cx"> 2015-01-22 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix build warning in WebKit2/UIProcess module
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosBKSProcessAssertionSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h (178926 => 178927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h 2015-01-22 19:05:42 UTC (rev 178926)
+++ trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h 2015-01-22 19:27:25 UTC (rev 178927)
</span><span class="lines">@@ -52,8 +52,9 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface BKSProcessAssertion (Details)
</span><ins>+@property (nonatomic, assign) BKSProcessAssertionFlags flags;
</ins><span class="cx"> - (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
</span><del>-@property (nonatomic, assign) BKSProcessAssertionFlags flags;
</del><ins>+- (void)invalidate;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>