Title: [116931] trunk/Source/WebCore
- Revision
- 116931
- Author
- [email protected]
- Date
- 2012-05-14 04:03:35 -0700 (Mon, 14 May 2012)
Log Message
[Qt] TextureMapperGL::drawTexture marked OVERRIDE but does not override any member function.
https://bugs.webkit.org/show_bug.cgi?id=86347
This bug was introduced by r116834.
TextureMapperGL implements two drawTexture functions.
The first one takes a BitmapTexture as an argument and does override TextureMapper::drawTexture().
The second one takes a texture id as an argument and does not override any member function.
* platform/graphics/texmap/TextureMapperGL.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116930 => 116931)
--- trunk/Source/WebCore/ChangeLog 2012-05-14 09:46:33 UTC (rev 116930)
+++ trunk/Source/WebCore/ChangeLog 2012-05-14 11:03:35 UTC (rev 116931)
@@ -1,3 +1,15 @@
+2012-05-14 Zeno Albisser <[email protected]>
+
+ [Qt] TextureMapperGL::drawTexture marked OVERRIDE but does not override any member function.
+ https://bugs.webkit.org/show_bug.cgi?id=86347
+
+ This bug was introduced by r116834.
+ TextureMapperGL implements two drawTexture functions.
+ The first one takes a BitmapTexture as an argument and does override TextureMapper::drawTexture().
+ The second one takes a texture id as an argument and does not override any member function.
+
+ * platform/graphics/texmap/TextureMapperGL.h:
+
2012-05-12 Pavel Feldman <[email protected]>
Web Inspector: implement tabs reordering via drag'n'drop.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (116930 => 116931)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2012-05-14 09:46:33 UTC (rev 116930)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2012-05-14 11:03:35 UTC (rev 116931)
@@ -51,7 +51,7 @@
// TextureMapper implementation
virtual void drawBorder(const Color&, float borderWidth, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix = TransformationMatrix()) OVERRIDE;
virtual void drawTexture(const BitmapTexture&, const FloatRect&, const TransformationMatrix&, float opacity, const BitmapTexture* maskTexture) OVERRIDE;
- virtual void drawTexture(uint32_t texture, Flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture) OVERRIDE;
+ virtual void drawTexture(uint32_t texture, Flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture);
virtual void bindSurface(BitmapTexture* surface) OVERRIDE;
virtual void beginClip(const TransformationMatrix&, const FloatRect&) OVERRIDE;
virtual void beginPainting(PaintFlags = 0) OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
