<!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>[209584] 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/209584">209584</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-12-08 17:21:07 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce PassRefPtr use in platform/graphics
https://bugs.webkit.org/show_bug.cgi?id=165636
Reviewed by Dean Jackson.
No change in behavior.
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/mac/DisplayRefreshMonitorMac.h:
(WebCore::DisplayRefreshMonitorMac::create):
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::createForCurrentGLContext):
(WebCore::GraphicsContext3D::paintRenderingResultsToImageData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMach">trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209583 => 209584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-09 00:56:48 UTC (rev 209583)
+++ trunk/Source/WebCore/ChangeLog 2016-12-09 01:21:07 UTC (rev 209584)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-08 Alex Christensen <achristensen@webkit.org>
+
+ Reduce PassRefPtr use in platform/graphics
+ https://bugs.webkit.org/show_bug.cgi?id=165636
+
+ Reviewed by Dean Jackson.
+
+ No change in behavior.
+
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/mac/DisplayRefreshMonitorMac.h:
+ (WebCore::DisplayRefreshMonitorMac::create):
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::createForCurrentGLContext):
+ (WebCore::GraphicsContext3D::paintRenderingResultsToImageData):
+
</ins><span class="cx"> 2016-12-08 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move FileHandle to WebCore FileHandle.h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (209583 => 209584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2016-12-09 00:56:48 UTC (rev 209583)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2016-12-09 01:21:07 UTC (rev 209584)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> void setErrorMessageCallback(std::unique_ptr<ErrorMessageCallback>);
</span><span class="cx">
</span><span class="cx"> static RefPtr<GraphicsContext3D> create(GraphicsContext3DAttributes, HostWindow*, RenderStyle = RenderOffscreen);
</span><del>- static PassRefPtr<GraphicsContext3D> createForCurrentGLContext();
</del><ins>+ static RefPtr<GraphicsContext3D> createForCurrentGLContext();
</ins><span class="cx"> ~GraphicsContext3D();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> void recycleContext();
</span><span class="cx">
</span><span class="cx"> void paintRenderingResultsToCanvas(ImageBuffer*);
</span><del>- PassRefPtr<ImageData> paintRenderingResultsToImageData();
</del><ins>+ RefPtr<ImageData> paintRenderingResultsToImageData();
</ins><span class="cx"> bool paintCompositedResultsToCanvas(ImageBuffer*);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h (209583 => 209584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2016-12-09 00:56:48 UTC (rev 209583)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2016-12-09 01:21:07 UTC (rev 209584)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef DisplayRefreshMonitorMac_h
-#define DisplayRefreshMonitorMac_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx">
</span><span class="lines">@@ -37,9 +36,9 @@
</span><span class="cx">
</span><span class="cx"> class DisplayRefreshMonitorMac : public DisplayRefreshMonitor {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<DisplayRefreshMonitorMac> create(PlatformDisplayID displayID)
</del><ins>+ static Ref<DisplayRefreshMonitorMac> create(PlatformDisplayID displayID)
</ins><span class="cx"> {
</span><del>- return adoptRef(new DisplayRefreshMonitorMac(displayID));
</del><ins>+ return adoptRef(*new DisplayRefreshMonitorMac(displayID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~DisplayRefreshMonitorMac();
</span><span class="lines">@@ -57,5 +56,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (209583 => 209584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2016-12-09 00:56:48 UTC (rev 209583)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2016-12-09 01:21:07 UTC (rev 209584)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<GraphicsContext3D> GraphicsContext3D::createForCurrentGLContext()
</del><ins>+RefPtr<GraphicsContext3D> GraphicsContext3D::createForCurrentGLContext()
</ins><span class="cx"> {
</span><span class="cx"> auto context = adoptRef(*new GraphicsContext3D({ }, 0, GraphicsContext3D::RenderToCurrentGLContext));
</span><span class="cx"> if (!context->m_private)
</span><span class="lines">@@ -195,12 +195,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ImageData> GraphicsContext3D::paintRenderingResultsToImageData()
</del><ins>+RefPtr<ImageData> GraphicsContext3D::paintRenderingResultsToImageData()
</ins><span class="cx"> {
</span><span class="cx"> // Reading premultiplied alpha would involve unpremultiplying, which is
</span><span class="cx"> // lossy.
</span><span class="cx"> if (m_attrs.premultipliedAlpha)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> auto imageData = ImageData::create(IntSize(m_currentWidth, m_currentHeight));
</span><span class="cx"> unsigned char* pixels = imageData->data()->data();
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> for (int i = 0; i < totalBytes; i += 4)
</span><span class="cx"> std::swap(pixels[i], pixels[i + 2]);
</span><span class="cx">
</span><del>- return WTFMove(imageData);
</del><ins>+ return imageData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::prepareTexture()
</span></span></pre>
</div>
</div>
</body>
</html>