<!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>[213146] releases/WebKitGTK/webkit-2.16/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/213146">213146</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-28 02:10:48 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213043">r213043</a> - [TextureMapper] Remove InterpolationQuality, TextDrawingModeFlags member variables
https://bugs.webkit.org/show_bug.cgi?id=168906
Reviewed by Carlos Garcia Campos.
Remove the InterpolationQuality and TextDrawingModeFlags member variables from the
TextureMapper class. These weren't modified anywhere in the code.
BitmapTexture::updateContents() still sets the image interpolation quality and
drawing mode on the ImageBuffer's GraphicsContext, but now uses the default
InterpolationDefault and TextModeFill values.
* platform/graphics/texmap/BitmapTexture.cpp:
(WebCore::BitmapTexture::updateContents):
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::TextureMapper::TextureMapper): Deleted.
(WebCore::TextureMapper::~TextureMapper): Deleted.
* platform/graphics/texmap/TextureMapper.h:
(WebCore::TextureMapper::setImageInterpolationQuality): Deleted.
(WebCore::TextureMapper::setTextDrawingMode): Deleted.
(WebCore::TextureMapper::imageInterpolationQuality): Deleted.
(WebCore::TextureMapper::textDrawingMode): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapBitmapTexturecpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp</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>
</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 (213145 => 213146)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:58:00 UTC (rev 213145)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 10:10:48 UTC (rev 213146)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-27 Zan Dobersek <zdobersek@igalia.com>
+
+ [TextureMapper] Remove InterpolationQuality, TextDrawingModeFlags member variables
+ https://bugs.webkit.org/show_bug.cgi?id=168906
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the InterpolationQuality and TextDrawingModeFlags member variables from the
+ TextureMapper class. These weren't modified anywhere in the code.
+
+ BitmapTexture::updateContents() still sets the image interpolation quality and
+ drawing mode on the ImageBuffer's GraphicsContext, but now uses the default
+ InterpolationDefault and TextModeFill values.
+
+ * platform/graphics/texmap/BitmapTexture.cpp:
+ (WebCore::BitmapTexture::updateContents):
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::TextureMapper::TextureMapper): Deleted.
+ (WebCore::TextureMapper::~TextureMapper): Deleted.
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::TextureMapper::setImageInterpolationQuality): Deleted.
+ (WebCore::TextureMapper::setTextDrawingMode): Deleted.
+ (WebCore::TextureMapper::imageInterpolationQuality): Deleted.
+ (WebCore::TextureMapper::textDrawingMode): Deleted.
+
</ins><span class="cx"> 2017-02-26 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformgraphicstexmapBitmapTexturecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp (213145 => 213146)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp 2017-02-28 09:58:00 UTC (rev 213145)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp 2017-02-28 10:10:48 UTC (rev 213146)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void BitmapTexture::updateContents(TextureMapper& textureMapper, GraphicsLayer* sourceLayer, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag updateContentsFlag, float scale)
</del><ins>+void BitmapTexture::updateContents(TextureMapper&, GraphicsLayer* sourceLayer, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag updateContentsFlag, float scale)
</ins><span class="cx"> {
</span><span class="cx"> // Making an unconditionally unaccelerated buffer here is OK because this code
</span><span class="cx"> // isn't used by any platforms that respect the accelerated bit.
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContext& context = imageBuffer->context();
</span><del>- context.setImageInterpolationQuality(textureMapper.imageInterpolationQuality());
- context.setTextDrawingMode(textureMapper.textDrawingMode());
</del><ins>+ context.setImageInterpolationQuality(InterpolationDefault);
+ context.setTextDrawingMode(TextModeFill);
</ins><span class="cx">
</span><span class="cx"> IntRect sourceRect(targetRect);
</span><span class="cx"> sourceRect.setLocation(offset);
</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 (213145 => 213146)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 09:58:00 UTC (rev 213145)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 10:10:48 UTC (rev 213146)
</span><span class="lines">@@ -28,6 +28,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+TextureMapper::TextureMapper() = default;
+
+TextureMapper::~TextureMapper() = default;
+
</ins><span class="cx"> PassRefPtr<BitmapTexture> TextureMapper::acquireTextureFromPool(const IntSize& size, const BitmapTexture::Flags flags)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapTexture> selectedTexture = m_texturePool->acquireTexture(size, flags);
</span><span class="lines">@@ -40,14 +44,4 @@
</span><span class="cx"> return platformCreateAccelerated();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextureMapper::TextureMapper()
- : m_interpolationQuality(InterpolationDefault)
- , m_textDrawingMode(TextModeFill)
- , m_isMaskMode(false)
- , m_wrapMode(StretchWrap)
-{ }
-
-TextureMapper::~TextureMapper()
-{ }
-
</del><span class="cx"> } // namespace
</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 (213145 => 213146)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 09:58:00 UTC (rev 213145)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 10:10:48 UTC (rev 213146)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define TextureMapper_h
</span><span class="cx">
</span><span class="cx"> #include "BitmapTexture.h"
</span><del>-#include "GraphicsContext.h"
</del><ins>+#include "Color.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="lines">@@ -79,12 +79,6 @@
</span><span class="cx"> virtual IntRect clipBounds() = 0;
</span><span class="cx"> virtual PassRefPtr<BitmapTexture> createTexture() = 0;
</span><span class="cx">
</span><del>- void setImageInterpolationQuality(InterpolationQuality quality) { m_interpolationQuality = quality; }
- void setTextDrawingMode(TextDrawingModeFlags mode) { m_textDrawingMode = mode; }
-
- InterpolationQuality imageInterpolationQuality() const { return m_interpolationQuality; }
- TextDrawingModeFlags textDrawingMode() const { return m_textDrawingMode; }
-
</del><span class="cx"> virtual void beginPainting(PaintFlags = 0) { }
</span><span class="cx"> virtual void endPainting() { }
</span><span class="cx">
</span><span class="lines">@@ -113,11 +107,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- InterpolationQuality m_interpolationQuality;
- TextDrawingModeFlags m_textDrawingMode;
- bool m_isMaskMode;
</del><ins>+ bool m_isMaskMode { false };
</ins><span class="cx"> TransformationMatrix m_patternTransform;
</span><del>- WrapMode m_wrapMode;
</del><ins>+ WrapMode m_wrapMode { StretchWrap };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>