Chromium Code Reviews| Index: Source/platform/graphics/ImageBuffer.cpp |
| diff --git a/Source/platform/graphics/ImageBuffer.cpp b/Source/platform/graphics/ImageBuffer.cpp |
| index ef575f944a61c02525b62a13ed0d12d395cd300d..35bbbd8782a0c7586f5535f22400e6501afef266 100644 |
| --- a/Source/platform/graphics/ImageBuffer.cpp |
| +++ b/Source/platform/graphics/ImageBuffer.cpp |
| @@ -237,7 +237,7 @@ bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu |
| GL_UNSIGNED_BYTE, 0, true, false, fromFrontBuffer); |
| } |
| -void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect* srcPtr, CompositeOperator op) |
| +void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect* srcPtr, CompositeOperator op, blink::WebBlendMode blendMode) |
|
f(malita)
2014/07/24 16:23:49
I don't think the namespace selector is needed her
fs
2014/07/25 10:52:00
Dropped.
|
| { |
| if (!isSurfaceValid()) |
| return; |
| @@ -245,7 +245,7 @@ void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, cons |
| FloatRect srcRect = srcPtr ? *srcPtr : FloatRect(FloatPoint(), size()); |
| RefPtr<SkPicture> picture = m_surface->getPicture(); |
| if (picture) { |
| - context->drawPicture(picture.release(), destRect, srcRect, op, blink::WebBlendModeNormal); |
| + context->drawPicture(picture.release(), destRect, srcRect, op, blendMode); |
| return; |
| } |
| @@ -259,7 +259,7 @@ void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, cons |
| RefPtr<Image> image = BitmapImage::create(NativeImageSkia::create(drawNeedsCopy(m_context.get(), context) ? deepSkBitmapCopy(bitmap) : bitmap)); |
| - context->drawImage(image.get(), destRect, srcRect, op, blink::WebBlendModeNormal, DoNotRespectImageOrientation); |
| + context->drawImage(image.get(), destRect, srcRect, op, blendMode, DoNotRespectImageOrientation); |
| } |
| void ImageBuffer::flush() |