Diff
Modified: trunk/Source/WebCore/ChangeLog (149812 => 149813)
--- 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)
@@ -1,3 +1,29 @@
+2013-05-09 Rob Buis <[email protected]>
+
+ [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:
+
2013-05-09 Alberto Garcia <[email protected]>
PluginDatabase: add plugin directory for the BlackBerry port.
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (149812 => 149813)
--- 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)
@@ -26,6 +26,8 @@
#include "ImageBuffer.h"
#include <wtf/CurrentTime.h>
+#if USE(TEXTURE_MAPPER)
+
namespace WebCore {
TextureMapperLayer* toTextureMapperLayer(GraphicsLayer* layer)
@@ -686,3 +688,4 @@
}
}
+#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (149812 => 149813)
--- 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)
@@ -20,6 +20,8 @@
#ifndef GraphicsLayerTextureMapper_h
#define GraphicsLayerTextureMapper_h
+#if USE(TEXTURE_MAPPER)
+
#include "GraphicsLayer.h"
#include "GraphicsLayerClient.h"
#include "Image.h"
@@ -187,4 +189,6 @@
TextureMapperLayer* toTextureMapperLayer(GraphicsLayer*);
}
+#endif
+
#endif // GraphicsLayerTextureMapper_h
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapper_h
#define TextureMapper_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#if PLATFORM(QT)
#include <qglobal.h>
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp (149812 => 149813)
--- 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)
@@ -19,7 +19,7 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "TextureMapperBackingStore.h"
#include "GraphicsLayer.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapperBackingStore_h
#define TextureMapperBackingStore_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "FloatRect.h"
#include "Image.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp (149812 => 149813)
--- 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)
@@ -21,7 +21,7 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "TextureMapperFPSCounter.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h (149812 => 149813)
--- 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)
@@ -22,7 +22,7 @@
#ifndef TextureMapperFPSCounter_h
#define TextureMapperFPSCounter_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "FloatPoint.h"
#include "TransformationMatrix.h"
#include <wtf/Noncopyable.h>
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (149812 => 149813)
--- 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)
@@ -65,6 +65,8 @@
#define GL_UNPACK_SKIP_ROWS 0x0CF3
#endif
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+
namespace WebCore {
struct TextureMapperGLData {
WTF_MAKE_FAST_ALLOCATED;
@@ -1272,3 +1274,4 @@
}
};
+#endif
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapperGL_h
#define TextureMapperGL_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "CustomFilterProgramInfo.h"
#include "FilterOperation.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (149812 => 149813)
--- 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)
@@ -24,7 +24,7 @@
#include "Region.h"
#include <wtf/MathExtras.h>
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapperLayer_h
#define TextureMapperLayer_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "FilterOperations.h"
#include "FloatRect.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp (149812 => 149813)
--- 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)
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "TextureMapperTile.h"
#include "Image.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTile.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapperTile_h
#define TextureMapperTile_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "FloatRect.h"
#include "Image.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp (149812 => 149813)
--- 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)
@@ -19,7 +19,7 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "TextureMapperTiledBackingStore.h"
#include "ImageBuffer.h"
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h (149812 => 149813)
--- 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)
@@ -20,7 +20,7 @@
#ifndef TextureMapperTiledBackingStore_h
#define TextureMapperTiledBackingStore_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
#include "FloatRect.h"
#include "Image.h"
