<!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>[200407] 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/200407">200407</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-05-04 00:36:17 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Clean up TextureMapperGLData, TextureMapperGLData::SharedGLData
https://bugs.webkit.org/show_bug.cgi?id=157303
Reviewed by Carlos Garcia Campos.
Torch the TextureMapperGLData and TextureMapperGLData::SharedGLData
classes into a better form.
SharedGLData is now private to the TextureMapperGLData class, but
lists that class as a friend. This enables moving the getShaderProgram()
method to TextureMapperGLData and removes the need to expose the
SharedGLData publicly. SharedGLData also doesn't have to keep a
reference to the GraphicsContext3D object.
TextureMapperGLData now default-initializes the publicly accessible
member variables while making some other members private, not exposing
anything that isn't necessary.
Usual whitespace cleanup included. More elegant HashMap::ensure()
insertions are used where they don't obfuscate object creation.
No new tests -- no change in behavior.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGLData::SharedGLData::currentSharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::contextDataMap):
(WebCore::TextureMapperGLData::SharedGLData::SharedGLData):
(WebCore::TextureMapperGLData::TextureMapperGLData):
(WebCore::TextureMapperGLData::~TextureMapperGLData):
(WebCore::TextureMapperGLData::initializeStencil):
(WebCore::TextureMapperGLData::getStaticVBO):
(WebCore::TextureMapperGLData::getShaderProgram):
(WebCore::TextureMapperGL::TextureMapperGL):
(WebCore::TextureMapperGL::drawBorder):
(WebCore::TextureMapperGL::drawTexture):
(WebCore::TextureMapperGL::drawSolidColor):
(WebCore::TextureMapperGL::drawFiltered):
(WebCore::TextureMapperGL::beginClip):
(WebCore::TextureMapperGLData::SharedGLData::glContextDataMap): Deleted.
(WebCore::TextureMapperGLData::SharedGLData::getShaderProgram): Deleted.
(WebCore::TextureMapperGLData::sharedGLData): Deleted.
* platform/graphics/texmap/TextureMapperGL.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200406 => 200407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-04 05:01:08 UTC (rev 200406)
+++ trunk/Source/WebCore/ChangeLog 2016-05-04 07:36:17 UTC (rev 200407)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2016-05-04 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Clean up TextureMapperGLData, TextureMapperGLData::SharedGLData
+ https://bugs.webkit.org/show_bug.cgi?id=157303
+
+ Reviewed by Carlos Garcia Campos.
+
+ Torch the TextureMapperGLData and TextureMapperGLData::SharedGLData
+ classes into a better form.
+
+ SharedGLData is now private to the TextureMapperGLData class, but
+ lists that class as a friend. This enables moving the getShaderProgram()
+ method to TextureMapperGLData and removes the need to expose the
+ SharedGLData publicly. SharedGLData also doesn't have to keep a
+ reference to the GraphicsContext3D object.
+
+ TextureMapperGLData now default-initializes the publicly accessible
+ member variables while making some other members private, not exposing
+ anything that isn't necessary.
+
+ Usual whitespace cleanup included. More elegant HashMap::ensure()
+ insertions are used where they don't obfuscate object creation.
+
+ No new tests -- no change in behavior.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGLData::SharedGLData::currentSharedGLData):
+ (WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
+ (WebCore::TextureMapperGLData::SharedGLData::contextDataMap):
+ (WebCore::TextureMapperGLData::SharedGLData::SharedGLData):
+ (WebCore::TextureMapperGLData::TextureMapperGLData):
+ (WebCore::TextureMapperGLData::~TextureMapperGLData):
+ (WebCore::TextureMapperGLData::initializeStencil):
+ (WebCore::TextureMapperGLData::getStaticVBO):
+ (WebCore::TextureMapperGLData::getShaderProgram):
+ (WebCore::TextureMapperGL::TextureMapperGL):
+ (WebCore::TextureMapperGL::drawBorder):
+ (WebCore::TextureMapperGL::drawTexture):
+ (WebCore::TextureMapperGL::drawSolidColor):
+ (WebCore::TextureMapperGL::drawFiltered):
+ (WebCore::TextureMapperGL::beginClip):
+ (WebCore::TextureMapperGLData::SharedGLData::glContextDataMap): Deleted.
+ (WebCore::TextureMapperGLData::SharedGLData::getShaderProgram): Deleted.
+ (WebCore::TextureMapperGLData::sharedGLData): Deleted.
+ * platform/graphics/texmap/TextureMapperGL.h:
+
</ins><span class="cx"> 2016-05-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize [StrictTypeChecking] on IDL attributes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (200406 => 200407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-05-04 05:01:08 UTC (rev 200406)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-05-04 07:36:17 UTC (rev 200407)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "TextureMapperShaderProgram.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span><span class="lines">@@ -47,113 +48,84 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-struct TextureMapperGLData {
</del><ins>+
+class TextureMapperGLData {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- struct SharedGLData : public RefCounted<SharedGLData> {
</del><ins>+ explicit TextureMapperGLData(GraphicsContext3D&);
+ ~TextureMapperGLData();
</ins><span class="cx">
</span><del>- typedef HashMap<PlatformGraphicsContext3D, SharedGLData*> GLContextDataMap;
- static GLContextDataMap& glContextDataMap()
- {
- static GLContextDataMap map;
- return map;
- }
</del><ins>+ void initializeStencil();
+ Platform3DObject getStaticVBO(GC3Denum target, GC3Dsizeiptr, const void* data);
+ Ref<TextureMapperShaderProgram> getShaderProgram(TextureMapperShaderProgram::Options);
</ins><span class="cx">
</span><del>- static PassRefPtr<SharedGLData> currentSharedGLData(GraphicsContext3D* context)
</del><ins>+ TransformationMatrix projectionMatrix;
+ TextureMapper::PaintFlags PaintFlags { 0 };
+ GC3Dint previousProgram { 0 };
+ GC3Dint targetFrameBuffer { 0 };
+ bool didModifyStencil { false };
+ GC3Dint previousScissorState { 0 };
+ GC3Dint previousDepthState { 0 };
+ GC3Dint viewport[4] { 0, };
+ GC3Dint previousScissor[4] { 0, };
+ RefPtr<BitmapTexture> currentSurface;
+ const BitmapTextureGL::FilterInfo* filterInfo { nullptr };
+
+private:
+ class SharedGLData : public RefCounted<SharedGLData> {
+ public:
+ static Ref<SharedGLData> currentSharedGLData(GraphicsContext3D& context)
</ins><span class="cx"> {
</span><del>- GLContextDataMap::iterator it = glContextDataMap().find(context->platformGraphicsContext3D());
- if (it != glContextDataMap().end())
- return it->value;
</del><ins>+ RefPtr<SharedGLData> data;
+ auto addResult = contextDataMap().add(context.platformGraphicsContext3D(), nullptr);
+ if (addResult.isNewEntry) {
+ data = adoptRef(new SharedGLData(context));
+ addResult.iterator->value = data.get();
+ } else
+ data = addResult.iterator->value;
</ins><span class="cx">
</span><del>- return adoptRef(new SharedGLData(context));
</del><ins>+ return *data;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- PassRefPtr<TextureMapperShaderProgram> getShaderProgram(TextureMapperShaderProgram::Options options)
</del><ins>+ ~SharedGLData()
</ins><span class="cx"> {
</span><del>- HashMap<TextureMapperShaderProgram::Options, RefPtr<TextureMapperShaderProgram> >::AddResult result = m_programs.add(options, nullptr);
- if (result.isNewEntry)
- result.iterator->value = TextureMapperShaderProgram::create(m_context, options);
-
- return result.iterator->value;
</del><ins>+ RELEASE_ASSERT(contextDataMap().contains(this));
+ contextDataMap().removeIf([this] (GLContextDataMap::KeyValuePairType& entry) { return entry.value == this; });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- HashMap<TextureMapperShaderProgram::Options, RefPtr<TextureMapperShaderProgram> > m_programs;
- RefPtr<GraphicsContext3D> m_context;
</del><ins>+ private:
+ friend class TextureMapperGLData;
</ins><span class="cx">
</span><del>- explicit SharedGLData(GraphicsContext3D* context)
- : m_context(context)
</del><ins>+ using GLContextDataMap = HashMap<PlatformGraphicsContext3D, SharedGLData*>;
+ static GLContextDataMap& contextDataMap()
</ins><span class="cx"> {
</span><del>- glContextDataMap().add(context->platformGraphicsContext3D(), this);
</del><ins>+ static NeverDestroyed<GLContextDataMap> map;
+ return map;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ~SharedGLData()
</del><ins>+ explicit SharedGLData(GraphicsContext3D& context)
</ins><span class="cx"> {
</span><del>- for (auto it = glContextDataMap().begin(), end = glContextDataMap().end(); it != end; ++it) {
- if (it->value == this) {
- glContextDataMap().remove(it);
- return;
- }
- }
-
- ASSERT_NOT_REACHED();
</del><ins>+ contextDataMap().add(context.platformGraphicsContext3D(), this);
</ins><span class="cx"> }
</span><ins>+
+ HashMap<TextureMapperShaderProgram::Options, RefPtr<TextureMapperShaderProgram>> m_programs;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- SharedGLData& sharedGLData() const
- {
- return *sharedData;
- }
-
- void initializeStencil();
-
- explicit TextureMapperGLData(GraphicsContext3D* context)
- : context(context)
- , PaintFlags(0)
- , previousProgram(0)
- , targetFrameBuffer(0)
- , didModifyStencil(false)
- , previousScissorState(0)
- , previousDepthState(0)
- , sharedData(TextureMapperGLData::SharedGLData::currentSharedGLData(this->context))
- , filterInfo(0)
- { }
-
- ~TextureMapperGLData();
- Platform3DObject getStaticVBO(GC3Denum target, GC3Dsizeiptr, const void* data);
-
- GraphicsContext3D* context;
- TransformationMatrix projectionMatrix;
- TextureMapper::PaintFlags PaintFlags;
- GC3Dint previousProgram;
- GC3Dint targetFrameBuffer;
- bool didModifyStencil;
- GC3Dint previousScissorState;
- GC3Dint previousDepthState;
- GC3Dint viewport[4];
- GC3Dint previousScissor[4];
- RefPtr<SharedGLData> sharedData;
- RefPtr<BitmapTexture> currentSurface;
- HashMap<const void*, Platform3DObject> vbos;
- const BitmapTextureGL::FilterInfo* filterInfo;
</del><ins>+ GraphicsContext3D& m_context;
+ Ref<SharedGLData> m_sharedGLData;
+ HashMap<const void*, Platform3DObject> m_vbos;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-Platform3DObject TextureMapperGLData::getStaticVBO(GC3Denum target, GC3Dsizeiptr size, const void* data)
</del><ins>+TextureMapperGLData::TextureMapperGLData(GraphicsContext3D& context)
+ : m_context(context)
+ , m_sharedGLData(SharedGLData::currentSharedGLData(m_context))
</ins><span class="cx"> {
</span><del>- HashMap<const void*, Platform3DObject>::AddResult result = vbos.add(data, 0);
- if (result.isNewEntry) {
- Platform3DObject vbo = context->createBuffer();
- context->bindBuffer(target, vbo);
- context->bufferData(target, size, data, GraphicsContext3D::STATIC_DRAW);
- result.iterator->value = vbo;
- }
-
- return result.iterator->value;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextureMapperGLData::~TextureMapperGLData()
</span><span class="cx"> {
</span><del>- for (auto& entry : vbos)
- context->deleteBuffer(entry.value);
</del><ins>+ for (auto& entry : m_vbos)
+ m_context.deleteBuffer(entry.value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperGLData::initializeStencil()
</span><span class="lines">@@ -166,16 +138,37 @@
</span><span class="cx"> if (didModifyStencil)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- context->clearStencil(0);
- context->clear(GraphicsContext3D::STENCIL_BUFFER_BIT);
</del><ins>+ m_context.clearStencil(0);
+ m_context.clear(GraphicsContext3D::STENCIL_BUFFER_BIT);
</ins><span class="cx"> didModifyStencil = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Platform3DObject TextureMapperGLData::getStaticVBO(GC3Denum target, GC3Dsizeiptr size, const void* data)
+{
+ auto addResult = m_vbos.ensure(data,
+ [this, target, size, data] {
+ Platform3DObject vbo = m_context.createBuffer();
+ m_context.bindBuffer(target, vbo);
+ m_context.bufferData(target, size, data, GraphicsContext3D::STATIC_DRAW);
+ return vbo;
+ });
+ return addResult.iterator->value;
+}
+
+Ref<TextureMapperShaderProgram> TextureMapperGLData::getShaderProgram(TextureMapperShaderProgram::Options options)
+{
+ auto addResult = m_sharedGLData->m_programs.ensure(options,
+ [this, options] { return TextureMapperShaderProgram::create(Ref<GraphicsContext3D>(m_context), options); });
+ return *addResult.iterator->value;
+}
+
</ins><span class="cx"> TextureMapperGL::TextureMapperGL()
</span><span class="cx"> : m_enableEdgeDistanceAntialiasing(false)
</span><span class="cx"> {
</span><span class="cx"> m_context3D = GraphicsContext3D::createForCurrentGLContext();
</span><del>- m_data = new TextureMapperGLData(m_context3D.get());
</del><ins>+ ASSERT(m_context3D);
+
+ m_data = new TextureMapperGLData(*m_context3D);
</ins><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> m_texturePool = std::make_unique<BitmapTexturePool>(m_context3D.copyRef());
</span><span class="cx"> #endif
</span><span class="lines">@@ -229,7 +222,7 @@
</span><span class="cx"> if (clipStack().isCurrentScissorBoxEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<TextureMapperShaderProgram> program = data().sharedGLData().getShaderProgram(TextureMapperShaderProgram::SolidColor);
</del><ins>+ RefPtr<TextureMapperShaderProgram> program = data().getShaderProgram(TextureMapperShaderProgram::SolidColor);
</ins><span class="cx"> m_context3D->useProgram(program->programID());
</span><span class="cx">
</span><span class="cx"> float r, g, b, a;
</span><span class="lines">@@ -456,8 +449,7 @@
</span><span class="cx"> if (useAntialiasing || opacity < 1)
</span><span class="cx"> flags |= ShouldBlend;
</span><span class="cx">
</span><del>- RefPtr<TextureMapperShaderProgram> program;
- program = data().sharedGLData().getShaderProgram(options);
</del><ins>+ RefPtr<TextureMapperShaderProgram> program = data().getShaderProgram(options);
</ins><span class="cx">
</span><span class="cx"> if (filter)
</span><span class="cx"> prepareFilterProgram(program.get(), *filter.get(), data().filterInfo->pass, textureSize, filterContentTextureID);
</span><span class="lines">@@ -474,7 +466,7 @@
</span><span class="cx"> flags |= ShouldBlend | ShouldAntialias;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<TextureMapperShaderProgram> program = data().sharedGLData().getShaderProgram(options);
</del><ins>+ RefPtr<TextureMapperShaderProgram> program = data().getShaderProgram(options);
</ins><span class="cx"> m_context3D->useProgram(program->programID());
</span><span class="cx">
</span><span class="cx"> float r, g, b, a;
</span><span class="lines">@@ -591,7 +583,7 @@
</span><span class="cx"> {
</span><span class="cx"> // For standard filters, we always draw the whole texture without transformations.
</span><span class="cx"> TextureMapperShaderProgram::Options options = optionsForFilterType(filter.type(), pass);
</span><del>- RefPtr<TextureMapperShaderProgram> program = data().sharedGLData().getShaderProgram(options);
</del><ins>+ RefPtr<TextureMapperShaderProgram> program = data().getShaderProgram(options);
</ins><span class="cx"> ASSERT(program);
</span><span class="cx">
</span><span class="cx"> prepareFilterProgram(program.get(), filter, pass, sampler.contentSize(), contentTexture ? static_cast<const BitmapTextureGL*>(contentTexture)->id() : 0);
</span><span class="lines">@@ -669,7 +661,7 @@
</span><span class="cx">
</span><span class="cx"> data().initializeStencil();
</span><span class="cx">
</span><del>- RefPtr<TextureMapperShaderProgram> program = data().sharedGLData().getShaderProgram(TextureMapperShaderProgram::SolidColor);
</del><ins>+ RefPtr<TextureMapperShaderProgram> program = data().getShaderProgram(TextureMapperShaderProgram::SolidColor);
</ins><span class="cx">
</span><span class="cx"> m_context3D->useProgram(program->programID());
</span><span class="cx"> m_context3D->enableVertexAttribArray(program->vertexLocation());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (200406 => 200407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2016-05-04 05:01:08 UTC (rev 200406)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2016-05-04 07:36:17 UTC (rev 200407)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct TextureMapperGLData;
</del><ins>+class TextureMapperGLData;
</ins><span class="cx"> class TextureMapperShaderProgram;
</span><span class="cx"> class FilterOperation;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>