<!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>[195979] trunk/Source/WebCore</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/195979">195979</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 14:07:06 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move some SPI declarations into the appropriate SPI header
https://bugs.webkit.org/show_bug.cgi?id=153755
Reviewed by Darin Adler.
* platform/graphics/cocoa/IOSurface.mm:
* platform/spi/cg/CoreGraphicsSPI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195978 => 195979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/ChangeLog 2016-02-01 22:07:06 UTC (rev 195979)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-02-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Move some SPI declarations into the appropriate SPI header
+ https://bugs.webkit.org/show_bug.cgi?id=153755
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/cocoa/IOSurface.mm:
+ * platform/spi/cg/CoreGraphicsSPI.h:
+
+2016-02-01 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Snapshot surfaces are forever wired after being compressed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153751
</span><span class="cx"> <rdar://problem/24354546>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (195978 => 195979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-02-01 22:07:06 UTC (rev 195979)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx">
</span><ins>+#import "CoreGraphicsSPI.h"
</ins><span class="cx"> #import "GraphicsContextCG.h"
</span><span class="cx"> #import "IOSurfacePool.h"
</span><span class="cx"> #import "IOSurfaceSPI.h"
</span><span class="lines">@@ -36,12 +37,6 @@
</span><span class="cx"> #import "MachSendRight.h"
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><del>-extern "C" {
-CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
-CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
-CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Move this into the SPI header once it's possible to put inside the APPLE_INTERNAL_SDK block.
</span><span class="cx"> NSString * const WebIOSurfaceAcceleratorUnwireSurfaceKey = @"UnwireSurface";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicgCoreGraphicsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (195978 => 195979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-02-01 21:50:27 UTC (rev 195978)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-02-01 22:07:06 UTC (rev 195979)
</span><span class="lines">@@ -29,12 +29,17 @@
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx">
</span><ins>+#if USE(IOSURFACE)
+#include "IOSurfaceSPI.h"
+#endif
+
</ins><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #include <CoreGraphics/CGFontCache.h>
</span><span class="cx"> #include <CoreGraphics/CoreGraphicsPrivate.h>
</span><span class="cx">
</span><span class="cx"> #else
</span><ins>+
</ins><span class="cx"> struct CGFontHMetrics {
</span><span class="cx"> int ascent;
</span><span class="cx"> int descent;
</span><span class="lines">@@ -165,6 +170,12 @@
</span><span class="cx"> CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
</span><span class="cx"> void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
</span><span class="cx">
</span><ins>+#if USE(IOSURFACE)
+CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
+CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
+CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
</span><span class="cx"> CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
</span></span></pre>
</div>
</div>
</body>
</html>