[BlackBerry] Image,ImageBuffer: add missing parameters to methods

https://bugs.webkit.org/show_bug.cgi?id=112148

Patch by Alberto Garcia <agarcia@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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 05d9d59..ab74428 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,24 @@
 2013-03-12  Alberto Garcia  <agarcia@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  <agarcia@igalia.com>
+
         [BlackBerry] MediaPlayerPrivate: fix call to MediaStreamDescriptor::label()
         https://bugs.webkit.org/show_bug.cgi?id=112140
 

diff --git a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
index 7d10cab..b105d5a 100644 (file)
--- a/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
+++ b/Source/WebCore/platform/graphics/blackberry/ImageBlackBerry.cpp
@@ -119,7 +119,7 @@ void BitmapImage::invalidatePlatformData()
 {
 }
 
-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 @@ void BitmapImage::draw(GraphicsContext* context, const FloatRect& dstRect, const
         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)

diff --git a/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp b/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp
index 0a09b58..5d8a245 100644 (file)
--- a/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp
+++ b/Source/WebCore/platform/graphics/blackberry/ImageBufferBlackBerry.cpp
@@ -207,7 +207,7 @@ PlatformLayer* ImageBuffer::platformLayer() const
     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 @@ void ImageBuffer::clip(GraphicsContext* context, const FloatRect& rect) const
     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);
 }