| Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| index 14a57200401d8f49ef197d41b25548874d325ea6..c053ae7a029b52687654d7efa5e24ab2eafc86c8 100644
|
| --- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| +++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp
|
| @@ -1300,17 +1300,17 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRec
|
| imageForRendering->setContainerSize(imageForRendering->size());
|
|
|
| if (rectContainsCanvas(normalizedDstRect)) {
|
| - c->drawImage(imageForRendering, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| + c->drawImage(imageForRendering, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| didDrawEntireCanvas();
|
| } else if (isFullCanvasCompositeMode(op)) {
|
| - fullCanvasCompositedDrawImage(imageForRendering, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op);
|
| + fullCanvasCompositedDrawImage(imageForRendering, normalizedDstRect, normalizedSrcRect, op);
|
| didDrawEntireCanvas();
|
| } else if (op == CompositeCopy) {
|
| clearCanvas();
|
| - c->drawImage(imageForRendering, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| + c->drawImage(imageForRendering, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| didDrawEntireCanvas();
|
| } else {
|
| - c->drawImage(imageForRendering, ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| + c->drawImage(imageForRendering, normalizedDstRect, normalizedSrcRect, op, blendMode);
|
| didDraw(normalizedDstRect);
|
| }
|
| }
|
| @@ -1379,17 +1379,17 @@ void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, const
|
| sourceCanvas->makeRenderingResultsAvailable();
|
|
|
| if (rectContainsCanvas(dstRect)) {
|
| - c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| + c->drawImageBuffer(buffer, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| didDrawEntireCanvas();
|
| } else if (isFullCanvasCompositeMode(state().m_globalComposite)) {
|
| - fullCanvasCompositedDrawImage(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite);
|
| + fullCanvasCompositedDrawImage(buffer, dstRect, srcRect, state().m_globalComposite);
|
| didDrawEntireCanvas();
|
| } else if (state().m_globalComposite == CompositeCopy) {
|
| clearCanvas();
|
| - c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| + c->drawImageBuffer(buffer, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| didDrawEntireCanvas();
|
| } else {
|
| - c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| + c->drawImageBuffer(buffer, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
|
| didDraw(dstRect);
|
| }
|
| }
|
| @@ -1536,7 +1536,7 @@ template<class T> IntRect CanvasRenderingContext2D::calculateCompositingBufferRe
|
| PassOwnPtr<ImageBuffer> CanvasRenderingContext2D::createCompositingBuffer(const IntRect& bufferRect)
|
| {
|
| RenderingMode renderMode = isAccelerated() ? Accelerated : Unaccelerated;
|
| - return ImageBuffer::create(bufferRect.size(), 1, ColorSpaceDeviceRGB, renderMode);
|
| + return ImageBuffer::create(bufferRect.size(), 1, renderMode);
|
| }
|
|
|
| void CanvasRenderingContext2D::compositeBuffer(ImageBuffer* buffer, const IntRect& bufferRect, CompositeOperator op)
|
| @@ -1557,21 +1557,21 @@ void CanvasRenderingContext2D::compositeBuffer(ImageBuffer* buffer, const IntRec
|
| c->clearRect(canvasRect);
|
| c->restore();
|
|
|
| - c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, bufferRect.location(), state().m_globalComposite);
|
| + c->drawImageBuffer(buffer, bufferRect.location(), state().m_globalComposite);
|
| c->restore();
|
| }
|
|
|
| -static void drawImageToContext(Image* image, GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| +static void drawImageToContext(Image* image, GraphicsContext* context, FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| {
|
| - context->drawImage(image, styleColorSpace, dest, src, op);
|
| + context->drawImage(image, dest, src, op);
|
| }
|
|
|
| -static void drawImageToContext(ImageBuffer* imageBuffer, GraphicsContext* context, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| +static void drawImageToContext(ImageBuffer* imageBuffer, GraphicsContext* context, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| {
|
| - context->drawImageBuffer(imageBuffer, styleColorSpace, dest, src, op);
|
| + context->drawImageBuffer(imageBuffer, dest, src, op);
|
| }
|
|
|
| -template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage(T* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| +template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage(T* image, const FloatRect& dest, const FloatRect& src, CompositeOperator op)
|
| {
|
| ASSERT(isFullCanvasCompositeMode(op));
|
|
|
| @@ -1597,7 +1597,7 @@ template<class T> void CanvasRenderingContext2D::fullCanvasCompositedDrawImage(
|
| buffer->context()->translate(-transformedAdjustedRect.location().x(), -transformedAdjustedRect.location().y());
|
| buffer->context()->translate(croppedOffset.width(), croppedOffset.height());
|
| buffer->context()->concatCTM(effectiveTransform);
|
| - drawImageToContext(image, buffer->context(), styleColorSpace, adjustedDest, src, CompositeSourceOver);
|
| + drawImageToContext(image, buffer->context(), adjustedDest, src, CompositeSourceOver);
|
|
|
| compositeBuffer(buffer.get(), bufferRect, op);
|
| }
|
|
|