<!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>[149813] 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/149813">149813</a></dd>
<dt>Author</dt> <dd>rwlbuis@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-09 08:46:36 -0700 (Thu, 09 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] texmap code generates warnings
https://bugs.webkit.org/show_bug.cgi?id=115815

Patch by Rob Buis &lt;rbuis@rim.com&gt; on 2013-05-09
Reviewed by Benjamin Poulain.

Add USE(TEXTURE_MAPPER) guards since Source/WebCore/CMakeLists.txt includes
these files unconditionally.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
* platform/graphics/texmap/TextureMapper.h:
* platform/graphics/texmap/TextureMapperBackingStore.cpp:
* platform/graphics/texmap/TextureMapperBackingStore.h:
* platform/graphics/texmap/TextureMapperFPSCounter.cpp:
* platform/graphics/texmap/TextureMapperFPSCounter.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
* platform/graphics/texmap/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapperLayer.cpp:
* platform/graphics/texmap/TextureMapperLayer.h:
* platform/graphics/texmap/TextureMapperTile.cpp:
* platform/graphics/texmap/TextureMapperTile.h:
* platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
* platform/graphics/texmap/TextureMapperTiledBackingStore.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStoreh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperFPSCountercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperFPSCounterh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h</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>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperTilecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperTileh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStoreh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/ChangeLog        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-05-09  Rob Buis  &lt;rbuis@rim.com&gt;
+
+        [BlackBerry] texmap code generates warnings
+        https://bugs.webkit.org/show_bug.cgi?id=115815
+
+        Reviewed by Benjamin Poulain.
+
+        Add USE(TEXTURE_MAPPER) guards since Source/WebCore/CMakeLists.txt includes
+        these files unconditionally.
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+        * platform/graphics/texmap/TextureMapper.h:
+        * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperBackingStore.h:
+        * platform/graphics/texmap/TextureMapperFPSCounter.cpp:
+        * platform/graphics/texmap/TextureMapperFPSCounter.h:
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        * platform/graphics/texmap/TextureMapperGL.h:
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        * platform/graphics/texmap/TextureMapperLayer.h:
+        * platform/graphics/texmap/TextureMapperTile.cpp:
+        * platform/graphics/texmap/TextureMapperTile.h:
+        * platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperTiledBackingStore.h:
+
</ins><span class="cx"> 2013-05-09  Alberto Garcia  &lt;agarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         PluginDatabase: add plugin directory for the BlackBerry port.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include &quot;ImageBuffer.h&quot;
</span><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><span class="cx"> 
</span><ins>+#if USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> TextureMapperLayer* toTextureMapperLayer(GraphicsLayer* layer)
</span><span class="lines">@@ -686,3 +688,4 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> #ifndef GraphicsLayerTextureMapper_h
</span><span class="cx"> #define GraphicsLayerTextureMapper_h
</span><span class="cx"> 
</span><ins>+#if USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> #include &quot;GraphicsLayer.h&quot;
</span><span class="cx"> #include &quot;GraphicsLayerClient.h&quot;
</span><span class="cx"> #include &quot;Image.h&quot;
</span><span class="lines">@@ -187,4 +189,6 @@
</span><span class="cx"> TextureMapperLayer* toTextureMapperLayer(GraphicsLayer*);
</span><span class="cx"> 
</span><span class="cx"> }
</span><ins>+#endif
+
</ins><span class="cx"> #endif // GraphicsLayerTextureMapper_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapper_h
</span><span class="cx"> #define TextureMapper_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(QT)
</span><span class="cx"> #include &lt;qglobal.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> #include &quot;TextureMapperBackingStore.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;GraphicsLayer.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapperBackingStore_h
</span><span class="cx"> #define TextureMapperBackingStore_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;FloatRect.h&quot;
</span><span class="cx"> #include &quot;Image.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperFPSCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;TextureMapperFPSCounter.h&quot;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperFPSCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #ifndef TextureMapperFPSCounter_h
</span><span class="cx"> #define TextureMapperFPSCounter_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> #include &quot;FloatPoint.h&quot;
</span><span class="cx"> #include &quot;TransformationMatrix.h&quot;
</span><span class="cx"> #include &lt;wtf/Noncopyable.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> #define GL_UNPACK_SKIP_ROWS 0x0CF3
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> struct TextureMapperGLData {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -1272,3 +1274,4 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> };
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapperGL_h
</span><span class="cx"> #define TextureMapperGL_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;CustomFilterProgramInfo.h&quot;
</span><span class="cx"> #include &quot;FilterOperation.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include &quot;Region.h&quot;
</span><span class="cx"> #include &lt;wtf/MathExtras.h&gt;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapperLayer_h
</span><span class="cx"> #define TextureMapperLayer_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;FilterOperations.h&quot;
</span><span class="cx"> #include &quot;FloatRect.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperTilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">  */
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> #include &quot;TextureMapperTile.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Image.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperTileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapperTile_h
</span><span class="cx"> #define TextureMapperTile_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;FloatRect.h&quot;
</span><span class="cx"> #include &quot;Image.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> #include &quot;TextureMapperTiledBackingStore.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;ImageBuffer.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h (149812 => 149813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h        2013-05-09 15:44:12 UTC (rev 149812)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h        2013-05-09 15:46:36 UTC (rev 149813)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #ifndef TextureMapperTiledBackingStore_h
</span><span class="cx"> #define TextureMapperTiledBackingStore_h
</span><span class="cx"> 
</span><del>-#if USE(ACCELERATED_COMPOSITING)
</del><ins>+#if USE(ACCELERATED_COMPOSITING) &amp;&amp; USE(TEXTURE_MAPPER)
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;FloatRect.h&quot;
</span><span class="cx"> #include &quot;Image.h&quot;
</span></span></pre>
</div>
</div>

</body>
</html>