Changeset 116931 in webkit

Timestamp:

May 14, 2012 4:03:35 AM (12 years ago)

Author:

zeno.albisser@nokia.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  Zeno Albisser  <zeno@webkit.org>
+
+        [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  <pfeldman@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h

@@ -52 +52 @@
     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;