- Revision
- 145550
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-12 08:23:08 -0700 (Tue, 12 Mar 2013)
Log Message
[BlackBerry] Image,ImageBuffer: add missing parameters to methods
https://bugs.webkit.org/show_bug.cgi?id=112148
Patch by Alberto Garcia <agar...@igalia.com> on 2013-03-12
Reviewed by Rob Buis.
BitmapImage::draw(), Image::drawPattern() and ImageBuffer::draw()
have a BlendMode parameter since r137011.
ImageBuffer::copyImage() has a ScaleBehavior parameter since r134100.
* platform/graphics/blackberry/ImageBlackBerry.cpp:
(WebCore::BitmapImage::draw):
(WebCore::Image::drawPattern):
* platform/graphics/blackberry/ImageBufferBlackBerry.cpp:
(WebCore::ImageBuffer::copyImage):
(WebCore::ImageBuffer::draw):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145549 => 145550)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 15:21:16 UTC (rev 145549)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 15:23:08 UTC (rev 145550)
@@ -1,5 +1,24 @@
2013-03-12 Alberto Garcia <agar...@igalia.com>
+ [BlackBerry] Image,ImageBuffer: add missing parameters to methods
+ https://bugs.webkit.org/show_bug.cgi?id=112148
+
+ Reviewed by Rob Buis.
+
+ BitmapImage::draw(), Image::drawPattern() and ImageBuffer::draw()
+ have a BlendMode parameter since r137011.
+
+ ImageBuffer::copyImage() has a ScaleBehavior parameter since r134100.
+
+ * platform/graphics/blackberry/ImageBlackBerry.cpp:
+ (WebCore::BitmapImage::draw):
+ (WebCore::Image::drawPattern):
+ * platform/graphics/blackberry/ImageBufferBlackBerry.cpp:
+ (WebCore::ImageBuffer::copyImage):
+ (WebCore::ImageBuffer::draw):
+
+2013-03-12 Alberto Garcia <agar...@igalia.com>
+
[BlackBerry] MediaPlayerPrivate: fix call to MediaStreamDescriptor::label()
https://bugs.webkit.org/show_bug.cgi?id=112140
Modified: trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp (145549 => 145550)
--- trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp 2013-03-12 15:21:16 UTC (rev 145549)
+++ trunk/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp 2013-03-12 15:23:08 UTC (rev 145550)
@@ -119,7 +119,7 @@
{
}
-void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op)
+void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
{
startAnimation();
@@ -146,7 +146,7 @@
observer->didDraw(this);
}
-void Image::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransformation, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& dstRect)
+void Image::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransformation, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& dstRect, BlendMode blendMode)
{
NativeImagePtr image = nativeImageForCurrentFrame();
if (!image)
Modified: trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp (145549 => 145550)
--- trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp 2013-03-12 15:21:16 UTC (rev 145549)
+++ trunk/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp 2013-03-12 15:23:08 UTC (rev 145550)
@@ -207,7 +207,7 @@
return m_data.m_platformLayer.get();
}
-PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior) const
+PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBehavior) const
{
// FIXME respect copyBehaviour enum.
unsigned* imageData = new unsigned[m_size.width() * m_size.height()];
@@ -224,7 +224,7 @@
context->platformContext()->addMaskLayer(rect, nativeImage);
}
-void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, bool useLowQualityScale)
+void ImageBuffer::draw(GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
{
m_data.draw(m_context.get(), context, styleColorSpace, destRect, srcRect, op, useLowQualityScale);
}
