Fix the TextureMapper build for GTK+.

No new tests. This is just a build fix.

* platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
* platform/graphics/texmap/TextureMapper.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index fc8eda4..a87f23d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-14  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix the TextureMapper build for GTK+.
+
+        No new tests. This is just a build fix.
+
+        * platform/graphics/cairo/GraphicsContext3DPrivate.cpp:
+        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+        * platform/graphics/texmap/TextureMapper.h:
+
 2012-03-12  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] Menulist buttons have separators even when the theme turns them off

diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp b/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp
index 69eef6e..7d9c44c 100644 (file)
--- a/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp
+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp
@@ -87,7 +87,8 @@ void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper
 
     TextureMapperGL* texmapGL = static_cast<TextureMapperGL*>(textureMapper);
     TextureMapperGL::Flags flags = TextureMapperGL::ShouldFlipTexture | (m_context->m_attrs.alpha ? TextureMapperGL::SupportsBlending : 0);
-    texmapGL->drawTexture(m_context->m_texture, flags, FloatSize(1, 1), targetRect, matrix, opacity, mask);
+    IntSize textureSize(m_context->m_currentWidth, m_context->m_currentHeight);
+    texmapGL->drawTexture(m_context->m_texture, flags, textureSize, targetRect, matrix, opacity, mask);
 }
 #endif // USE(ACCELERATED_COMPOSITING)
 

diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapper.h b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
index 8ca967d..9f262c0 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
@@ -20,16 +20,17 @@
 #ifndef TextureMapper_h
 #define TextureMapper_h
 
+#if USE(ACCELERATED_COMPOSITING)
+
 #if PLATFORM(QT)
 #include <qglobal.h>
-#endif
 
-#if USE(ACCELERATED_COMPOSITING)
 #if defined(QT_OPENGL_LIB) || (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     #if defined(QT_OPENGL_ES_2) && !defined(TEXMAP_OPENGL_ES_2)
         #define TEXMAP_OPENGL_ES_2
     #endif
 #endif
+#endif
 
 #include "FilterOperations.h"
 #include "GraphicsContext.h"