<!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>[190095] trunk/Source</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/190095">190095</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2015-09-21 17:51:41 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer
https://bugs.webkit.org/show_bug.cgi?id=149399
Reviewed by Darin Adler.
This fixes build failure after <a href="http://trac.webkit.org/projects/webkit/changeset/189144">r189144</a>
Source/WebCore:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::tiledBackingStorePaint):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
* platform/graphics/texmap/coordinated/CoordinatedSurface.h:
* platform/graphics/texmap/coordinated/Tile.cpp:
(WebCore::Tile::paintToSurfaceContext):
* platform/graphics/texmap/coordinated/Tile.h:
* platform/graphics/texmap/coordinated/TiledBackingStoreClient.h:
* platform/graphics/texmap/coordinated/UpdateAtlas.cpp:
Source/WebKit2:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
(WebKit::ThreadSafeCoordinatedSurface::paintToSurface):
(WebKit::ThreadSafeCoordinatedSurface::beginPaint):
(WebKit::ThreadSafeCoordinatedSurface::endPaint):
* Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedSurfaceh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedSurface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedTilecpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedTileh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStoreClienth">trunk/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlascpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfaceh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/ChangeLog 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-09-21 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer
+ https://bugs.webkit.org/show_bug.cgi?id=149399
+
+ Reviewed by Darin Adler.
+
+ This fixes build failure after r189144
+
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::tiledBackingStorePaint):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+ * platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
+ * platform/graphics/texmap/coordinated/CoordinatedSurface.h:
+ * platform/graphics/texmap/coordinated/Tile.cpp:
+ (WebCore::Tile::paintToSurfaceContext):
+ * platform/graphics/texmap/coordinated/Tile.h:
+ * platform/graphics/texmap/coordinated/TiledBackingStoreClient.h:
+ * platform/graphics/texmap/coordinated/UpdateAtlas.cpp:
+
</ins><span class="cx"> 2015-09-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> The binding for getDistributedNodes unnecessarily makes a vector of nodes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -869,11 +869,11 @@
</span><span class="cx"> m_mainBackingStore->setSupportsAlpha(!contentsOpaque());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsLayer::tiledBackingStorePaint(GraphicsContext* context, const IntRect& rect)
</del><ins>+void CoordinatedGraphicsLayer::tiledBackingStorePaint(GraphicsContext& context, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (rect.isEmpty())
</span><span class="cx"> return;
</span><del>- paintGraphicsLayerContents(*context, rect);
</del><ins>+ paintGraphicsLayerContents(context, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::didUpdateTileBuffers()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> IntRect transformedVisibleRect();
</span><span class="cx">
</span><span class="cx"> // TiledBackingStoreClient
</span><del>- virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) override;
</del><ins>+ virtual void tiledBackingStorePaint(GraphicsContext&, const IntRect&) override;
</ins><span class="cx"> virtual void didUpdateTileBuffers() override;
</span><span class="cx"> virtual void tiledBackingStoreHasPendingTileCreation() override;
</span><span class="cx"> virtual void createTile(uint32_t tileID, float) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void paintToSurfaceContext(GraphicsContext* context) override
</del><ins>+ virtual void paintToSurfaceContext(GraphicsContext& context) override
</ins><span class="cx"> {
</span><del>- context->drawImage(m_image, ColorSpaceDeviceRGB, m_rect, m_rect);
</del><ins>+ context.drawImage(m_image, ColorSpaceDeviceRGB, m_rect, m_rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedSurface.h (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedSurface.h 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedSurface.h 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class Client {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Client() { }
</span><del>- virtual void paintToSurfaceContext(GraphicsContext*) = 0;
</del><ins>+ virtual void paintToSurfaceContext(GraphicsContext&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef PassRefPtr<CoordinatedSurface> Factory(const IntSize&, Flags);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedTilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -93,10 +93,10 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Tile::paintToSurfaceContext(GraphicsContext* context)
</del><ins>+void Tile::paintToSurfaceContext(GraphicsContext& context)
</ins><span class="cx"> {
</span><del>- context->translate(-m_dirtyRect.x(), -m_dirtyRect.y());
- context->scale(FloatSize(m_tiledBackingStore.contentsScale(), m_tiledBackingStore.contentsScale()));
</del><ins>+ context.translate(-m_dirtyRect.x(), -m_dirtyRect.y());
+ context.scale(FloatSize(m_tiledBackingStore.contentsScale(), m_tiledBackingStore.contentsScale()));
</ins><span class="cx"> m_tiledBackingStore.client()->tiledBackingStorePaint(context, m_tiledBackingStore.mapToContents(m_dirtyRect));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedTileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.h (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.h 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/Tile.h 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> const IntRect& rect() const { return m_rect; }
</span><span class="cx"> void resize(const IntSize&);
</span><span class="cx">
</span><del>- virtual void paintToSurfaceContext(GraphicsContext*) override;
</del><ins>+ virtual void paintToSurfaceContext(GraphicsContext&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TiledBackingStore& m_tiledBackingStore;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedTiledBackingStoreClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreClient.h (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreClient.h 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreClient.h 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> class TiledBackingStoreClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~TiledBackingStoreClient() { }
</span><del>- virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
</del><ins>+ virtual void tiledBackingStorePaint(GraphicsContext&, const IntRect&) = 0;
</ins><span class="cx"> virtual void didUpdateTileBuffers() = 0;
</span><span class="cx"> virtual void tiledBackingStoreHasPendingTileCreation() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedUpdateAtlascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void paintToSurfaceContext(GraphicsContext* context) override
</del><ins>+ virtual void paintToSurfaceContext(GraphicsContext& context) override
</ins><span class="cx"> {
</span><span class="cx"> if (m_supportsAlpha) {
</span><del>- context->setCompositeOperation(CompositeCopy);
- context->fillRect(IntRect(IntPoint::zero(), m_size), Color::transparent, ColorSpaceDeviceRGB);
- context->setCompositeOperation(CompositeSourceOver);
</del><ins>+ context.setCompositeOperation(CompositeCopy);
+ context.fillRect(IntRect(IntPoint::zero(), m_size), Color::transparent, ColorSpaceDeviceRGB);
+ context.setCompositeOperation(CompositeSourceOver);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_client->paintToSurfaceContext(context);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-21 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [Threaded Compositor] Modified to use reference of GraphicsContext instead of pointer
+ https://bugs.webkit.org/show_bug.cgi?id=149399
+
+ Reviewed by Darin Adler.
+
+ This fixes build failure after r189144
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
+ (WebKit::ThreadSafeCoordinatedSurface::paintToSurface):
+ (WebKit::ThreadSafeCoordinatedSurface::beginPaint):
+ (WebKit::ThreadSafeCoordinatedSurface::endPaint):
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h:
+
</ins><span class="cx"> 2015-09-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the ability for tests to run script in the UI process in WebKitTestRunner
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsWebCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><span class="cx"> auto context = createGraphicsContext(rect);
</span><del>- client->paintToSurfaceContext(context.get());
</del><ins>+ client->paintToSurfaceContext(*context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -59,25 +59,25 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client);
</span><span class="cx">
</span><del>- GraphicsContext* context = beginPaint(rect);
</del><ins>+ GraphicsContext& context = beginPaint(rect);
</ins><span class="cx"> client->paintToSurfaceContext(context);
</span><span class="cx"> endPaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsContext* ThreadSafeCoordinatedSurface::beginPaint(const IntRect& rect)
</del><ins>+GraphicsContext& ThreadSafeCoordinatedSurface::beginPaint(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_imageBuffer);
</span><del>- GraphicsContext* graphicsContext = m_imageBuffer->context();
- graphicsContext->save();
- graphicsContext->clip(rect);
- graphicsContext->translate(rect.x(), rect.y());
</del><ins>+ GraphicsContext& graphicsContext = m_imageBuffer->context();
+ graphicsContext.save();
+ graphicsContext.clip(rect);
+ graphicsContext.translate(rect.x(), rect.y());
</ins><span class="cx"> return graphicsContext;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadSafeCoordinatedSurface::endPaint()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_imageBuffer);
</span><del>- m_imageBuffer->context()->restore();
</del><ins>+ m_imageBuffer->context().restore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadSafeCoordinatedSurface::copyToTexture(PassRefPtr<BitmapTexture> passTexture, const IntRect& target, const IntPoint& sourceOffset)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h (190094 => 190095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h 2015-09-22 00:38:14 UTC (rev 190094)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h 2015-09-22 00:51:41 UTC (rev 190095)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ThreadSafeCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags, std::unique_ptr<WebCore::ImageBuffer>);
</span><span class="cx">
</span><del>- WebCore::GraphicsContext* beginPaint(const WebCore::IntRect&);
</del><ins>+ WebCore::GraphicsContext& beginPaint(const WebCore::IntRect&);
</ins><span class="cx"> void endPaint();
</span><span class="cx">
</span><span class="cx"> // Create a ThreadSafeCoordinatedSurface referencing an exisiting ImageBuffer
</span></span></pre>
</div>
</div>
</body>
</html>