Title: [110764] trunk/Source/WebCore
- Revision
- 110764
- Author
- [email protected]
- Date
- 2012-03-14 15:05:55 -0700 (Wed, 14 Mar 2012)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110763 => 110764)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 22:05:07 UTC (rev 110763)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 22:05:55 UTC (rev 110764)
@@ -1,3 +1,13 @@
+2012-03-14 Martin Robinson <[email protected]>
+
+ 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 <[email protected]>
[GTK] Menulist buttons have separators even when the theme turns them off
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp (110763 => 110764)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp 2012-03-14 22:05:07 UTC (rev 110763)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp 2012-03-14 22:05:55 UTC (rev 110764)
@@ -87,7 +87,8 @@
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)
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (110763 => 110764)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2012-03-14 22:05:07 UTC (rev 110763)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2012-03-14 22:05:55 UTC (rev 110764)
@@ -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"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
