<!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>[225454] 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/225454">225454</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-12-02 15:11:12 -0800 (Sat, 02 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make IOSurface::Locker and use it in ImageBufferDataCG
https://bugs.webkit.org/show_bug.cgi?id=180317

Reviewed by Zalan Bujtas.

Add an RAII IOSurface::Locker which can lock readonly or readwrite. Access
to the IOSurface base address is through the locker.

Add IOSurface::bytesPerRow() to wrap IOSurfaceGetBytesPerRow().

After this, there is only one location where we access the IOSurfaceRef
directly, in WebGL code.

* platform/graphics/cg/ImageBufferDataCG.cpp:
(WebCore::ImageBufferData::toBGRAData const):
(WebCore::ImageBufferData::getData const):
(WebCore::ImageBufferData::putData):
* platform/graphics/cocoa/IOSurface.h:
* platform/graphics/cocoa/IOSurface.mm:
(WebCore::IOSurface::bytesPerRow const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp</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 (225453 => 225454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-02 20:35:46 UTC (rev 225453)
+++ trunk/Source/WebCore/ChangeLog      2017-12-02 23:11:12 UTC (rev 225454)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-12-02  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Make IOSurface::Locker and use it in ImageBufferDataCG
+        https://bugs.webkit.org/show_bug.cgi?id=180317
+
+        Reviewed by Zalan Bujtas.
+
+        Add an RAII IOSurface::Locker which can lock readonly or readwrite. Access
+        to the IOSurface base address is through the locker.
+        
+        Add IOSurface::bytesPerRow() to wrap IOSurfaceGetBytesPerRow().
+        
+        After this, there is only one location where we access the IOSurfaceRef
+        directly, in WebGL code.
+
+        * platform/graphics/cg/ImageBufferDataCG.cpp:
+        (WebCore::ImageBufferData::toBGRAData const):
+        (WebCore::ImageBufferData::getData const):
+        (WebCore::ImageBufferData::putData):
+        * platform/graphics/cocoa/IOSurface.h:
+        * platform/graphics/cocoa/IOSurface.mm:
+        (WebCore::IOSurface::bytesPerRow const):
+
+2017-12-02  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Add an AlphaPremultiplication enum and use it consistently
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=180316
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (225453 => 225454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp  2017-12-02 20:35:46 UTC (rev 225453)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp     2017-12-02 23:11:12 UTC (rev 225454)
</span><span class="lines">@@ -131,10 +131,8 @@
</span><span class="cx">         return result;
</span><span class="cx">     }
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>-    IOSurfaceRef surfaceRef = surface->surface();
-    IOSurfaceLock(surfaceRef, kIOSurfaceLockReadOnly, nullptr);
-    transferData(result.data(), IOSurfaceGetBaseAddress(surfaceRef), width, height, IOSurfaceGetBytesPerRow(surfaceRef));
-    IOSurfaceUnlock(surfaceRef, kIOSurfaceLockReadOnly, nullptr);
</del><ins>+    IOSurface::Locker lock(*surface);
+    transferData(result.data(), lock.surfaceBaseAddress(), width, height, surface->bytesPerRow());
</ins><span class="cx"> #else
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="cx"> #endif
</span><span class="lines">@@ -303,14 +301,11 @@
</span><span class="cx">         }
</span><span class="cx">     } else {
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>-        // FIXME: WebCore::IOSurface should have a locking RAII object and base-address getter.
-        IOSurfaceRef surfaceRef = surface->surface();
-        IOSurfaceLock(surfaceRef, kIOSurfaceLockReadOnly, nullptr);
-        srcBytesPerRow = IOSurfaceGetBytesPerRow(surfaceRef);
-        srcRows = static_cast<uint8_t*>(IOSurfaceGetBaseAddress(surfaceRef)) + originy * srcBytesPerRow + originx * 4;
</del><ins>+        IOSurface::Locker lock(*surface);
+        srcBytesPerRow = surface->bytesPerRow();
+        srcRows = static_cast<uint8_t*>(lock.surfaceBaseAddress()) + originy * srcBytesPerRow + originx * 4;
</ins><span class="cx"> 
</span><span class="cx"> #if USE(ACCELERATE)
</span><del>-
</del><span class="cx">         vImage_Buffer src;
</span><span class="cx">         src.width = width.unsafeGet();
</span><span class="cx">         src.height = height.unsafeGet();
</span><span class="lines">@@ -389,7 +384,6 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> #endif // USE(ACCELERATE)
</span><del>-        IOSurfaceUnlock(surfaceRef, kIOSurfaceLockReadOnly, nullptr);
</del><span class="cx"> #else
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx"> #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="lines">@@ -529,10 +523,9 @@
</span><span class="cx">         }
</span><span class="cx">     } else {
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>-        IOSurfaceRef surfaceRef = surface->surface();
-        IOSurfaceLock(surfaceRef, 0, nullptr);
-        destBytesPerRow = IOSurfaceGetBytesPerRow(surfaceRef);
-        destRows = static_cast<uint8_t*>(IOSurfaceGetBaseAddress(surfaceRef)) + (desty * destBytesPerRow + destx * 4).unsafeGet();
</del><ins>+        IOSurface::Locker lock(*surface, IOSurface::Locker::AccessMode::ReadWrite);
+        destBytesPerRow = surface->bytesPerRow();
+        destRows = static_cast<uint8_t*>(lock.surfaceBaseAddress()) + (desty * destBytesPerRow + destx * 4).unsafeGet();
</ins><span class="cx"> 
</span><span class="cx"> #if USE(ACCELERATE)
</span><span class="cx">         vImage_Buffer src;
</span><span class="lines">@@ -595,8 +588,6 @@
</span><span class="cx">             srcRows += srcBytesPerRow;
</span><span class="cx">         }
</span><span class="cx"> #endif // USE(ACCELERATE)
</span><del>-
-        IOSurfaceUnlock(surfaceRef, 0, nullptr);
</del><span class="cx"> #else
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx"> #endif // USE(IOSURFACE_CANVAS_BACKING_STORE)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h (225453 => 225454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2017-12-02 20:35:46 UTC (rev 225453)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.h    2017-12-02 23:11:12 UTC (rev 225454)
</span><span class="lines">@@ -48,7 +48,40 @@
</span><span class="cx">         RGB10,
</span><span class="cx">         RGB10A8,
</span><span class="cx">     };
</span><ins>+    
+    class Locker {
+    public:
+        enum class AccessMode {
+            ReadOnly,
+            ReadWrite
+        };
</ins><span class="cx"> 
</span><ins>+        Locker(IOSurface& surface, AccessMode mode = AccessMode::ReadOnly)
+            : m_surface(surface)
+            , m_flags(flagsFromMode(mode))
+        {
+            IOSurfaceLock(m_surface.surface(), m_flags, nullptr);
+        }
+
+        ~Locker()
+        {
+            IOSurfaceUnlock(m_surface.surface(), m_flags, nullptr);
+        }
+
+        void * surfaceBaseAddress() const
+        {
+            return IOSurfaceGetBaseAddress(m_surface.surface());
+        }
+
+    private:
+        static uint32_t flagsFromMode(AccessMode mode)
+        {
+            return mode == AccessMode::ReadOnly ? kIOSurfaceLockReadOnly : 0;
+        }
+        IOSurface& m_surface;
+        uint32_t m_flags;
+    };
+
</ins><span class="cx">     WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, CGColorSpaceRef, Format = Format::RGBA);
</span><span class="cx">     WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, IntSize contextSize, CGColorSpaceRef, Format = Format::RGBA);
</span><span class="cx">     WEBCORE_EXPORT static std::unique_ptr<IOSurface> createFromSendRight(const MachSendRight&&, CGColorSpaceRef);
</span><span class="lines">@@ -89,9 +122,11 @@
</span><span class="cx"> 
</span><span class="cx">     IntSize size() const { return m_size; }
</span><span class="cx">     size_t totalBytes() const { return m_totalBytes; }
</span><ins>+
</ins><span class="cx">     CGColorSpaceRef colorSpace() const { return m_colorSpace.get(); }
</span><span class="cx">     WEBCORE_EXPORT Format format() const;
</span><span class="cx">     IOSurfaceID surfaceID() const;
</span><ins>+    size_t bytesPerRow() const;
</ins><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT bool isInUse() const;
</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 (225453 => 225454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm        2017-12-02 20:35:46 UTC (rev 225453)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm   2017-12-02 23:11:12 UTC (rev 225454)
</span><span class="lines">@@ -372,6 +372,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+size_t IOSurface::bytesPerRow() const
+{
+    return IOSurfaceGetBytesPerRow(m_surface.get());
+}
+
</ins><span class="cx"> bool IOSurface::isInUse() const
</span><span class="cx"> {
</span><span class="cx">     return IOSurfaceIsInUse(m_surface.get());
</span></span></pre>
</div>
</div>

</body>
</html>