<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194630] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194630">194630</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-05 20:12:47 -0800 (Tue, 05 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ImageBuffer::clip() code into GraphicsContext
https://bugs.webkit.org/show_bug.cgi?id=152769
Reviewed by Zalan Bujtas.
For CG, GraphicsContext had clipToNativeImage(PassNativeImagePtr...), which
was ugly and platform-specific.
Fix by moving code from ImageBuffer::clip() for CG and Cairo into the platform-specific
GraphicsContext implementations. This required some minor refactoring of scaleSizeToUserSpace()
in ImageBufferCG.
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::clipToImageBuffer): Deleted.
* platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::sizeForDestinationSize):
* platform/graphics/ImageBuffer.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::clipToImageBuffer):
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::clip): Deleted.
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::clipToImageBuffer):
(WebCore::GraphicsContext::clipToNativeImage): Deleted.
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::ImageBuffer):
(WebCore::ImageBuffer::sizeForDestinationSize):
(WebCore::ImageBuffer::putByteArray):
(WebCore::ImageBuffer::toDataURL):
(WebCore::ImageBuffer::clip): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBuffercpp">trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/ChangeLog 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-01-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Move ImageBuffer::clip() code into GraphicsContext
+ https://bugs.webkit.org/show_bug.cgi?id=152769
+
+ Reviewed by Zalan Bujtas.
+
+ For CG, GraphicsContext had clipToNativeImage(PassNativeImagePtr...), which
+ was ugly and platform-specific.
+
+ Fix by moving code from ImageBuffer::clip() for CG and Cairo into the platform-specific
+ GraphicsContext implementations. This required some minor refactoring of scaleSizeToUserSpace()
+ in ImageBufferCG.
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::clipToImageBuffer): Deleted.
+ * platform/graphics/ImageBuffer.cpp:
+ (WebCore::ImageBuffer::sizeForDestinationSize):
+ * platform/graphics/ImageBuffer.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::clipToImageBuffer):
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::clip): Deleted.
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::clipToImageBuffer):
+ (WebCore::GraphicsContext::clipToNativeImage): Deleted.
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+ (WebCore::ImageBuffer::sizeForDestinationSize):
+ (WebCore::ImageBuffer::putByteArray):
+ (WebCore::ImageBuffer::toDataURL):
+ (WebCore::ImageBuffer::clip): Deleted.
+
+2016-01-05 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Remove GraphicsContext::drawJoinedLines()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152764
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -500,13 +500,6 @@
</span><span class="cx"> clipOut(path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::clipToImageBuffer(ImageBuffer& buffer, const FloatRect& rect)
-{
- if (paintingDisabled())
- return;
- buffer.clip(*this, rect);
-}
-
</del><span class="cx"> #if !USE(CG) && !USE(CAIRO)
</span><span class="cx"> IntRect GraphicsContext::clipBounds() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -258,8 +258,6 @@
</span><span class="cx"> void applyFillPattern();
</span><span class="cx"> void drawPath(const Path&);
</span><span class="cx">
</span><del>- void clipToNativeImage(PassNativeImagePtr, const FloatRect& destRect, const FloatSize& bufferSize);
-
</del><span class="cx"> WEBCORE_EXPORT void setIsCALayerContext(bool);
</span><span class="cx"> bool isCALayerContext() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -81,6 +81,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(CG)
</span><ins>+FloatSize ImageBuffer::sizeForDestinationSize(FloatSize size) const
+{
+ return size;
+}
+
</ins><span class="cx"> void ImageBuffer::transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace)
</span><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(Vector<int>, deviceRgbLUT, ());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx"> const IntSize& internalSize() const { return m_size; }
</span><span class="cx"> const IntSize& logicalSize() const { return m_logicalSize; }
</span><span class="cx">
</span><ins>+ FloatSize sizeForDestinationSize(FloatSize) const;
+
</ins><span class="cx"> float resolutionScale() const { return m_resolutionScale; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT GraphicsContext& context() const;
</span><span class="lines">@@ -116,6 +118,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> PlatformLayer* platformLayer() const;
</span><span class="cx">
</span><ins>+#if USE(CAIRO)
+ NativeImagePtr nativeImage() const;
+#endif
+
</ins><span class="cx"> // FIXME: current implementations of this method have the restriction that they only work
</span><span class="cx"> // with textures that are RGB or RGBA format, and UNSIGNED_BYTE type.
</span><span class="cx"> bool copyToPlatformTexture(GraphicsContext3D&, GC3Denum, Platform3DObject, GC3Denum, bool, bool);
</span><span class="lines">@@ -135,8 +141,7 @@
</span><span class="cx"> static RetainPtr<CGImageRef> sinkIntoNativeImage(std::unique_ptr<ImageBuffer>);
</span><span class="cx"> void flushContext() const;
</span><span class="cx"> #endif
</span><del>- void clip(GraphicsContext&, const FloatRect&) const;
-
</del><ins>+
</ins><span class="cx"> void draw(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
</span><span class="cx"> void drawPattern(GraphicsContext&, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "FloatRoundedRect.h"
</span><span class="cx"> #include "Font.h"
</span><span class="cx"> #include "GraphicsContextPlatformPrivateCairo.h"
</span><ins>+#include "ImageBuffer.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "Path.h"
</span><span class="lines">@@ -537,6 +538,17 @@
</span><span class="cx"> m_data->clip(path);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsContext::clipToImageBuffer(ImageBuffer& buffer, const FloatRect& destRect)
+{
+ if (paintingDisabled())
+ return;
+
+ RefPtr<Image> image = buffer.copyImage(DontCopyBackingStore);
+ RefPtr<cairo_surface_t> surface = image->nativeImageForCurrentFrame();
+ if (surface)
+ platformContext()->pushImageMask(surface.get(), destRect);
+}
+
</ins><span class="cx"> IntRect GraphicsContext::clipBounds() const
</span><span class="cx"> {
</span><span class="cx"> double x1, x2, y1, y2;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -214,11 +214,6 @@
</span><span class="cx"> return DontCopyBackingStore;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::clip(GraphicsContext& context, const FloatRect& maskRect) const
-{
- context.platformContext()->pushImageMask(m_data.m_surface.get(), maskRect);
-}
-
</del><span class="cx"> void ImageBuffer::drawConsuming(std::unique_ptr<ImageBuffer> imageBuffer, GraphicsContext& destContext, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
</span><span class="cx"> {
</span><span class="cx"> imageBuffer->draw(destContext, destRect, srcRect, op, blendMode, useLowQualityScale);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -350,14 +350,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::clipToNativeImage(PassNativeImagePtr image, const FloatRect& destRect, const FloatSize& bufferSize)
</del><ins>+void GraphicsContext::clipToImageBuffer(ImageBuffer& buffer, const FloatRect& destRect)
</ins><span class="cx"> {
</span><ins>+ if (paintingDisabled())
+ return;
+
+ FloatSize bufferDestinationSize = buffer.sizeForDestinationSize(destRect.size());
+ RetainPtr<CGImageRef> image = buffer.copyNativeImage(DontCopyBackingStore);
+
</ins><span class="cx"> CGContextRef context = platformContext();
</span><span class="cx"> // FIXME: This image needs to be grayscale to be used as an alpha mask here.
</span><del>- CGContextTranslateCTM(context, destRect.x(), destRect.y() + bufferSize.height());
</del><ins>+ CGContextTranslateCTM(context, destRect.x(), destRect.y() + bufferDestinationSize.height());
</ins><span class="cx"> CGContextScaleCTM(context, 1, -1);
</span><del>- CGContextClipToRect(context, FloatRect(FloatPoint(0, bufferSize.height() - destRect.height()), destRect.size()));
- CGContextClipToMask(context, FloatRect(FloatPoint(), bufferSize), image);
</del><ins>+ CGContextClipToRect(context, FloatRect(FloatPoint(0, bufferDestinationSize.height() - destRect.height()), destRect.size()));
+ CGContextClipToMask(context, FloatRect(FloatPoint(), bufferDestinationSize), image.get());
</ins><span class="cx"> CGContextScaleCTM(context, 1, -1);
</span><span class="cx"> CGContextTranslateCTM(context, -destRect.x(), -destRect.y() - destRect.height());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (194629 => 194630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-01-06 04:12:43 UTC (rev 194629)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-01-06 04:12:47 UTC (rev 194630)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> RetainPtr<CGContextRef> cgContext;
</span><span class="cx"> if (accelerateRendering) {
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><del>- FloatSize userBounds = scaleSizeToUserSpace(FloatSize(width.unsafeGet(), height.unsafeGet()), m_data.backingStoreSize, m_size);
</del><ins>+ FloatSize userBounds = sizeForDestinationSize(FloatSize(width.unsafeGet(), height.unsafeGet()));
</ins><span class="cx"> m_data.surface = IOSurface::create(m_data.backingStoreSize, IntSize(userBounds), imageColorSpace);
</span><span class="cx"> cgContext = m_data.surface->ensurePlatformContext();
</span><span class="cx"> if (cgContext)
</span><span class="lines">@@ -155,6 +155,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatSize ImageBuffer::sizeForDestinationSize(FloatSize destinationSize) const
+{
+ return scaleSizeToUserSpace(destinationSize, m_data.backingStoreSize, internalSize());
+}
+
</ins><span class="cx"> GraphicsContext& ImageBuffer::context() const
</span><span class="cx"> {
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="lines">@@ -314,13 +319,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::clip(GraphicsContext& contextToClip, const FloatRect& rect) const
-{
- FloatSize backingStoreSizeInUserSpace = scaleSizeToUserSpace(rect.size(), m_data.backingStoreSize, internalSize());
- RetainPtr<CGImageRef> image = copyNativeImage(DontCopyBackingStore);
- contextToClip.clipToNativeImage(image.get(), rect, backingStoreSizeInUserSpace);
-}
-
</del><span class="cx"> PassRefPtr<Uint8ClampedArray> ImageBuffer::getUnmultipliedImageData(const IntRect& rect, CoordinateSystem coordinateSystem) const
</span><span class="cx"> {
</span><span class="cx"> if (context().isAcceleratedContext())
</span><span class="lines">@@ -387,7 +385,7 @@
</span><span class="cx"> CGContextSetShadowWithColor(destContext, CGSizeZero, 0, 0);
</span><span class="cx">
</span><span class="cx"> // Draw the image in CG coordinate space
</span><del>- FloatSize scaledDestSize = scaleSizeToUserSpace(coordinateSystem == LogicalCoordinateSystem ? logicalSize() : internalSize(), m_data.backingStoreSize, internalSize());
</del><ins>+ FloatSize scaledDestSize = sizeForDestinationSize(coordinateSystem == LogicalCoordinateSystem ? logicalSize() : internalSize());
</ins><span class="cx"> IntPoint destPointInCGCoords(destPoint.x() + sourceRect.x(), scaledDestSize.height() - (destPoint.y() + sourceRect.y()) - sourceRect.height());
</span><span class="cx"> IntRect destRectInCGCoords(destPointInCGCoords, sourceCopySize);
</span><span class="cx"> CGContextClipToRect(destContext, destRectInCGCoords);
</span><span class="lines">@@ -506,7 +504,7 @@
</span><span class="cx"> RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</span><span class="cx"> CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextClipToRect(context.get(), CGRectMake(0, 0, logicalSize().width(), logicalSize().height()));
</span><del>- FloatSize imageSizeInUserSpace = scaleSizeToUserSpace(logicalSize(), m_data.backingStoreSize, internalSize());
</del><ins>+ FloatSize imageSizeInUserSpace = sizeForDestinationSize(logicalSize());
</ins><span class="cx"> CGContextDrawImage(context.get(), CGRectMake(0, 0, imageSizeInUserSpace.width(), imageSizeInUserSpace.height()), image.get());
</span><span class="cx"> image = adoptCF(CGBitmapContextCreateImage(context.get()));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>