<!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>[180342] 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/180342">180342</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 00:40:26 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the software-only ImageBuffer::m_context to ImageBufferData
https://bugs.webkit.org/show_bug.cgi?id=141784
Reviewed by Simon Fraser.
* platform/graphics/ImageBuffer.h:
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::context):
* platform/graphics/cairo/ImageBufferDataCairo.h:
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::context):
* platform/graphics/cg/ImageBufferDataCG.h:
Move m_context to ImageBufferData in the software-only section;
for accelerated contexts, the GraphicsContext is owned by the IOSurface wrapper.
This will make it harder for ImageBuffer to make the mistake of using
m_context blindly without thinking when it will often be null.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h</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="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/ChangeLog 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-19 Tim Horton <timothy_horton@apple.com>
+
+ Move the software-only ImageBuffer::m_context to ImageBufferData
+ https://bugs.webkit.org/show_bug.cgi?id=141784
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/ImageBuffer.h:
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+ (WebCore::ImageBuffer::context):
+ * platform/graphics/cairo/ImageBufferDataCairo.h:
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+ (WebCore::ImageBuffer::context):
+ * platform/graphics/cg/ImageBufferDataCG.h:
+ Move m_context to ImageBufferData in the software-only section;
+ for accelerated contexts, the GraphicsContext is owned by the IOSurface wrapper.
+ This will make it harder for ImageBuffer to make the mistake of using
+ m_context blindly without thinking when it will often be null.
+
</ins><span class="cx"> 2015-02-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r179347): Clearing the PageCache no longer clears the PageCache.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -153,7 +153,6 @@
</span><span class="cx"> IntSize m_size;
</span><span class="cx"> IntSize m_logicalSize;
</span><span class="cx"> float m_resolutionScale;
</span><del>- OwnPtr<GraphicsContext> m_context;
</del><span class="cx"> FloatSize m_space;
</span><span class="cx">
</span><span class="cx"> // This constructor will place its success into the given out-variable
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_t> cr = adoptRef(cairo_create(m_data.m_surface.get()));
</span><span class="cx"> m_data.m_platformContext.setCr(cr.get());
</span><del>- m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
</del><ins>+ m_data.m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
</ins><span class="cx"> success = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> GraphicsContext* ImageBuffer::context() const
</span><span class="cx"> {
</span><del>- return m_context.get();
</del><ins>+ return m_data.m_context.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBehavior) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_surface_t> m_surface;
</span><span class="cx"> PlatformContextCairo m_platformContext;
</span><ins>+ OwnPtr<GraphicsContext> m_context;
</ins><span class="cx"> IntSize m_size;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> if (!cgContext)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_context = adoptPtr(new GraphicsContext(cgContext.get()));
</del><ins>+ m_data.m_context = adoptPtr(new GraphicsContext(cgContext.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> context()->scale(FloatSize(1, -1));
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> if (m_data.m_surface)
</span><span class="cx"> return &m_data.m_surface->ensureGraphicsContext();
</span><span class="cx"> #endif
</span><del>- return m_context.get();
</del><ins>+ return m_data.m_context.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::flushContext() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.cpp 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ImageBufferData.h"
</span><span class="cx">
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (180341 => 180342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-02-19 08:36:28 UTC (rev 180341)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-02-19 08:40:26 UTC (rev 180342)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> void* m_data;
</span><span class="cx"> RetainPtr<CGDataProviderRef> m_dataProvider;
</span><span class="cx"> CGBitmapInfo m_bitmapInfo;
</span><ins>+ OwnPtr<GraphicsContext> m_context;
</ins><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> // Only for Accelerated ImageBuffers.
</span></span></pre>
</div>
</div>
</body>
</html>