Title: [171725] trunk/Source/WebCore
- Revision
- 171725
- Author
- zandober...@gmail.com
- Date
- 2014-07-29 01:12:46 -0700 (Tue, 29 Jul 2014)
Log Message
[TexMap] GraphicsLayerTextureMapper::addAnimation() box size parameter should be FloatSize
https://bugs.webkit.org/show_bug.cgi?id=135237
Reviewed by Martin Robinson.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::addAnimation):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h: The boxSize parameter of the
addAnimation() method must be of the same type as the parameter in the base class
declaration -- a const FloatSize reference. Only then is the base virtual method
actually overriden.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171724 => 171725)
--- trunk/Source/WebCore/ChangeLog 2014-07-29 07:52:11 UTC (rev 171724)
+++ trunk/Source/WebCore/ChangeLog 2014-07-29 08:12:46 UTC (rev 171725)
@@ -1,3 +1,17 @@
+2014-07-29 Zan Dobersek <zdober...@igalia.com>
+
+ [TexMap] GraphicsLayerTextureMapper::addAnimation() box size parameter should be FloatSize
+ https://bugs.webkit.org/show_bug.cgi?id=135237
+
+ Reviewed by Martin Robinson.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::addAnimation):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h: The boxSize parameter of the
+ addAnimation() method must be of the same type as the parameter in the base class
+ declaration -- a const FloatSize reference. Only then is the base virtual method
+ actually overriden.
+
2014-07-28 Dan Bernstein <m...@apple.com>
iOS build fix.
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (171724 => 171725)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-07-29 07:52:11 UTC (rev 171724)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-07-29 08:12:46 UTC (rev 171725)
@@ -620,7 +620,7 @@
return drawsContent() && contentsAreVisible() && !m_size.isEmpty();
}
-bool GraphicsLayerTextureMapper::addAnimation(const KeyframeValueList& valueList, const IntSize& boxSize, const Animation* anim, const String& keyframesName, double timeOffset)
+bool GraphicsLayerTextureMapper::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& keyframesName, double timeOffset)
{
ASSERT(!keyframesName.isEmpty());
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (171724 => 171725)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-07-29 07:52:11 UTC (rev 171724)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-07-29 08:12:46 UTC (rev 171725)
@@ -81,7 +81,7 @@
inline int changeMask() const { return m_changeMask; }
- virtual bool addAnimation(const KeyframeValueList&, const IntSize&, const Animation*, const String&, double);
+ virtual bool addAnimation(const KeyframeValueList&, const FloatSize&, const Animation*, const String&, double);
virtual void pauseAnimation(const String&, double);
virtual void removeAnimation(const String&);
void setAnimations(const GraphicsLayerAnimations&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
