<!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>[213145] releases/WebKitGTK/webkit-2.16/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/213145">213145</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-28 01:58:00 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213035">r213035</a> - [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
https://bugs.webkit.org/show_bug.cgi?id=168903
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Remove the GraphicsContext pointer member from the TextureMapper class
since the getter and setter methods are not used anywhere.
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::TextureMapper::TextureMapper):
* platform/graphics/texmap/TextureMapper.h:
(WebCore::TextureMapper::setGraphicsContext): Deleted.
(WebCore::TextureMapper::graphicsContext): Deleted.
Source/WebKit2:
Remove the CoordinatedGraphicsScene::paintToGraphicsContext() method as it
is not used anywhere. Also enables removing the GraphicsContext pointer
member from the TextureMapper class.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::paintToGraphicsContext): Deleted.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapTextureMappercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapTextureMapperh">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh">releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-26 Zan Dobersek <zdobersek@igalia.com>
+
+ [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
+ https://bugs.webkit.org/show_bug.cgi?id=168903
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the GraphicsContext pointer member from the TextureMapper class
+ since the getter and setter methods are not used anywhere.
+
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::TextureMapper::TextureMapper):
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::TextureMapper::setGraphicsContext): Deleted.
+ (WebCore::TextureMapper::graphicsContext): Deleted.
+
</ins><span class="cx"> 2017-02-25 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Move coverage functions out of SimpleLineLayout.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -41,8 +41,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextureMapper::TextureMapper()
</span><del>- : m_context(0)
- , m_interpolationQuality(InterpolationDefault)
</del><ins>+ : m_interpolationQuality(InterpolationDefault)
</ins><span class="cx"> , m_textDrawingMode(TextModeFill)
</span><span class="cx"> , m_isMaskMode(false)
</span><span class="cx"> , m_wrapMode(StretchWrap)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapTextureMapperh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx">
</span><span class="cx"> // makes a surface the target for the following drawTexture calls.
</span><span class="cx"> virtual void bindSurface(BitmapTexture* surface) = 0;
</span><del>- void setGraphicsContext(GraphicsContext* context) { m_context = context; }
- GraphicsContext* graphicsContext() { return m_context; }
</del><span class="cx"> virtual void beginClip(const TransformationMatrix&, const FloatRect&) = 0;
</span><span class="cx"> virtual void endClip() = 0;
</span><span class="cx"> virtual IntRect clipBounds() = 0;
</span><span class="lines">@@ -100,7 +98,6 @@
</span><span class="cx"> void setWrapMode(WrapMode m) { m_wrapMode = m; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- GraphicsContext* m_context;
</del><span class="cx"> std::unique_ptr<BitmapTexturePool> m_texturePool;
</span><span class="cx">
</span><span class="cx"> bool isInMaskMode() const { return m_isMaskMode; }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-26 Zan Dobersek <zdobersek@igalia.com>
+
+ [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
+ https://bugs.webkit.org/show_bug.cgi?id=168903
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the CoordinatedGraphicsScene::paintToGraphicsContext() method as it
+ is not used anywhere. Also enables removing the GraphicsContext pointer
+ member from the TextureMapper class.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::paintToGraphicsContext): Deleted.
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+
</ins><span class="cx"> 2017-02-25 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed, document deficiency in webkit_website_data_manager_clear() API
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -125,32 +125,6 @@
</span><span class="cx"> updateViewport();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::paintToGraphicsContext(PlatformGraphicsContext* platformContext, const Color& backgroundColor, bool drawsBackground)
-{
- if (!m_textureMapper)
- m_textureMapper = TextureMapper::create();
- syncRemoteContent();
- TextureMapperLayer* layer = rootLayer();
-
- if (!layer)
- return;
-
- GraphicsContext graphicsContext(platformContext);
- m_textureMapper->setGraphicsContext(&graphicsContext);
- m_textureMapper->beginPainting();
-
- IntRect clipRect = graphicsContext.clipBounds();
- if (drawsBackground)
- m_textureMapper->drawSolidColor(clipRect, TransformationMatrix(), backgroundColor);
- else
- m_textureMapper->drawSolidColor(clipRect, TransformationMatrix(), m_viewBackgroundColor);
-
- layer->paint();
- m_fpsCounter.updateFPSAndDisplay(*m_textureMapper, clipRect.location());
- m_textureMapper->endPainting();
- m_textureMapper->setGraphicsContext(0);
-}
-
</del><span class="cx"> void CoordinatedGraphicsScene::updateViewport()
</span><span class="cx"> {
</span><span class="cx"> if (!m_client)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (213144 => 213145)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-28 09:58:00 UTC (rev 213145)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> explicit CoordinatedGraphicsScene(CoordinatedGraphicsSceneClient*);
</span><span class="cx"> virtual ~CoordinatedGraphicsScene();
</span><span class="cx"> void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&, const WebCore::Color& backgroundColor, bool drawsBackground, const WebCore::FloatPoint&, WebCore::TextureMapper::PaintFlags = 0);
</span><del>- void paintToGraphicsContext(PlatformGraphicsContext*, const WebCore::Color& backgroundColor, bool drawsBackground);
</del><span class="cx"> void detach();
</span><span class="cx"> void appendUpdate(std::function<void()>&&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>