<!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>[166528] 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/166528">166528</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 14:10:44 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small adjustments to WebCore::IOSurface
https://bugs.webkit.org/show_bug.cgi?id=130981
Reviewed by Simon Fraser.
* WebCore.exp.in:
Export some more things.
* platform/graphics/cocoa/IOSurface.h:
createImage() can't be const because it calls ensurePlatformContext().
* platform/graphics/cocoa/IOSurface.mm:
(IOSurface::createImage):
We should be able to create an image even if the CGContext has been cleared (or never created).
(IOSurface::isInUse):
Rename inUse() to isInUse().
(IOSurface::clearGraphicsContext):
Add clearGraphicsContext().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166527 => 166528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 21:08:13 UTC (rev 166527)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 21:10:44 UTC (rev 166528)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-03-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Small adjustments to WebCore::IOSurface
+ https://bugs.webkit.org/show_bug.cgi?id=130981
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.exp.in:
+ Export some more things.
+
+ * platform/graphics/cocoa/IOSurface.h:
+ createImage() can't be const because it calls ensurePlatformContext().
+
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::createImage):
+ We should be able to create an image even if the CGContext has been cleared (or never created).
+
+ (IOSurface::isInUse):
+ Rename inUse() to isInUse().
+
+ (IOSurface::clearGraphicsContext):
+ Add clearGraphicsContext().
+
+2014-03-31 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Allocate IOSurfaces with the same cache mode that CoreAnimation uses
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130982
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166527 => 166528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-31 21:08:13 UTC (rev 166527)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-31 21:10:44 UTC (rev 166528)
</span><span class="lines">@@ -3070,13 +3070,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><ins>+__ZN7WebCore9IOSurface11createImageEv
</ins><span class="cx"> __ZN7WebCore9IOSurface14setIsPurgeableEb
</span><span class="cx"> __ZN7WebCore9IOSurface18createFromMachPortEjNS_10ColorSpaceE
</span><ins>+__ZN7WebCore9IOSurface20clearGraphicsContextEv
</ins><span class="cx"> __ZN7WebCore9IOSurface21ensureGraphicsContextEv
</span><span class="cx"> __ZN7WebCore9IOSurface21ensurePlatformContextEv
</span><span class="cx"> __ZN7WebCore9IOSurface6createENS_7IntSizeENS_10ColorSpaceE
</span><del>-__ZNK7WebCore9IOSurface11createImageEv
</del><span class="cx"> __ZNK7WebCore9IOSurface14createMachPortEv
</span><ins>+__ZNK7WebCore9IOSurface7isInUseEv
</ins><span class="cx"> _wkIOSurfaceContextCreate
</span><span class="cx"> _wkIOSurfaceContextCreateImage
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (166527 => 166528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2014-03-31 21:08:13 UTC (rev 166527)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2014-03-31 21:10:44 UTC (rev 166528)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> // Any images created from a surface need to be released before releasing
</span><span class="cx"> // the surface, or an expensive GPU readback can result.
</span><del>- RetainPtr<CGImageRef> createImage() const;
</del><ins>+ RetainPtr<CGImageRef> createImage();
</ins><span class="cx">
</span><span class="cx"> IOSurfaceRef surface() const { return m_surface.get(); }
</span><span class="cx"> GraphicsContext& ensureGraphicsContext();
</span><span class="lines">@@ -71,8 +71,12 @@
</span><span class="cx"> size_t totalBytes() const { return m_totalBytes; }
</span><span class="cx"> ColorSpace colorSpace() const { return m_colorSpace; }
</span><span class="cx">
</span><del>- bool inUse() const;
</del><ins>+ bool isInUse() const;
</ins><span class="cx">
</span><ins>+ // The graphics context cached on the surface counts as a "user", so to get
+ // an accurate result from isInUse(), it needs to be released.
+ void clearGraphicsContext();
+
</ins><span class="cx"> private:
</span><span class="cx"> IOSurface(IntSize, ColorSpace);
</span><span class="cx"> IOSurface(IOSurfaceRef, ColorSpace);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (166527 => 166528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2014-03-31 21:08:13 UTC (rev 166527)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2014-03-31 21:10:44 UTC (rev 166528)
</span><span class="lines">@@ -115,12 +115,9 @@
</span><span class="cx"> return IOSurfaceCreateMachPort(m_surface.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CGImageRef> IOSurface::createImage() const
</del><ins>+RetainPtr<CGImageRef> IOSurface::createImage()
</ins><span class="cx"> {
</span><del>- if (!m_cgContext)
- return nullptr;
-
- return adoptCF(CGIOSurfaceContextCreateImage(m_cgContext.get()));
</del><ins>+ return adoptCF(CGIOSurfaceContextCreateImage(ensurePlatformContext()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CGContextRef IOSurface::ensurePlatformContext()
</span><span class="lines">@@ -186,9 +183,15 @@
</span><span class="cx"> return IOSurface::SurfaceState::Valid;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool IOSurface::inUse() const
</del><ins>+bool IOSurface::isInUse() const
</ins><span class="cx"> {
</span><span class="cx"> return IOSurfaceIsInUse(m_surface.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IOSurface::clearGraphicsContext()
+{
+ m_graphicsContext = nullptr;
+ m_cgContext = nullptr;
+}
+
</ins><span class="cx"> #endif // USE(IOSURFACE)
</span></span></pre>
</div>
</div>
</body>
</html>