<!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>[193886] branches/safari-601.1.46-branch/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/193886">193886</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 19:16:43 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190910">r190910</a>. rdar://problem/23432368</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsBitmapImagecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsBitmapImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsCrossfadeGeneratedImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGeneratedImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GeneratedImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGradientImagecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGradientImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsContextcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsContexth">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsImagecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsImageBufferh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsNamedImageGeneratedImageh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscgImageBufferCGcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscgImageCGcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderBoxModelObjectcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvggraphicsSVGImagecpp">branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvggraphicsSVGImageh">branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvggraphicsSVGImageForContainercpp">branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoresvggraphicsSVGImageForContainerh">branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-12-09 Simon Fraser <simon.fraser@apple.com>
+
+ Merge r190910. rdar://problem/23432368
+
+ 2015-10-12 Simon Fraser <simon.fraser@apple.com>
+
+ Remove Image::spaceSize() and ImageBuffer::spaceSize()
+ https://bugs.webkit.org/show_bug.cgi?id=150064
+
+ Reviewed by Tim Horton.
+
+ Image spacing when tiled should not be a property of the image; but a description
+ of how it's drawn, like tile size. So remove spacing from Image and ImageBuffer,
+ and pass it in as an argument.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::drawPattern):
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/CrossfadeGeneratedImage.cpp:
+ (WebCore::CrossfadeGeneratedImage::drawPattern):
+ * platform/graphics/CrossfadeGeneratedImage.h:
+ * platform/graphics/GeneratedImage.h:
+ * platform/graphics/GradientImage.cpp:
+ (WebCore::GradientImage::drawPattern):
+ * platform/graphics/GradientImage.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::drawTiledImage):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::drawTiled):
+ * platform/graphics/Image.h:
+ (WebCore::Image::spaceSize): Deleted.
+ (WebCore::Image::setSpaceSize): Deleted.
+ * platform/graphics/ImageBuffer.h:
+ (WebCore::ImageBuffer::spaceSize): Deleted.
+ (WebCore::ImageBuffer::setSpaceSize): Deleted.
+ * platform/graphics/NamedImageGeneratedImage.cpp:
+ (WebCore::NamedImageGeneratedImage::drawPattern):
+ * platform/graphics/NamedImageGeneratedImage.h:
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::copyImage):
+ (WebCore::ImageBuffer::drawPattern):
+ * platform/graphics/cg/ImageCG.cpp:
+ (WebCore::Image::drawPattern):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::drawPatternForContainer):
+ * svg/graphics/SVGImage.h:
+ * svg/graphics/SVGImageForContainer.cpp:
+ (WebCore::SVGImageForContainer::drawPattern):
+ * svg/graphics/SVGImageForContainer.h:
+
</ins><span class="cx"> 2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192639. rdar://problem/23814338
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -606,13 +606,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& transform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (tileRect.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!ctxt->drawLuminanceMask()) {
</span><del>- Image::drawPattern(ctxt, tileRect, transform, phase, styleColorSpace, op, destRect, blendMode);
</del><ins>+ Image::drawPattern(ctxt, tileRect, transform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!m_cachedImage) {
</span><span class="lines">@@ -634,12 +634,10 @@
</span><span class="cx"> m_cachedImage = buffer->copyImage(DontCopyBackingStore, Unscaled);
</span><span class="cx"> if (!m_cachedImage)
</span><span class="cx"> return;
</span><del>-
- m_cachedImage->setSpaceSize(spaceSize());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ctxt->setDrawLuminanceMask(false);
</span><del>- m_cachedImage->drawPattern(ctxt, tileRect, transform, phase, styleColorSpace, op, destRect, blendMode);
</del><ins>+ m_cachedImage->drawPattern(ctxt, tileRect, transform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/BitmapImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx"> virtual void stopAnimation() override;
</span><span class="cx"> virtual void resetAnimation() override;
</span><span class="cx">
</span><del>- virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
</del><ins>+ virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) override;
</ins><span class="cx">
</span><span class="cx"> // Accessors for native image formats.
</span><span class="cx">
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(WINGDI)
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> size_t currentFrame() const { return m_currentFrame; }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> drawCrossfade(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</span><span class="cx"> if (!imageBuffer)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> drawCrossfade(graphicsContext);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsCrossfadeGeneratedImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</span><del>- virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</del><ins>+ virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> CrossfadeGeneratedImage(Image* fromImage, Image* toImage, float percentage, const FloatSize& crossfadeSize, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGeneratedImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GeneratedImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GeneratedImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GeneratedImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override = 0;
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override = 0;
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override = 0;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Implement this to be less conservative.
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGradientImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GradientImage::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> // Allow the generator to provide visually-equivalent tiling parameters for better performance.
</span><span class="cx"> FloatSize adjustedSize = size();
</span><span class="lines">@@ -88,11 +88,10 @@
</span><span class="cx"> m_cachedImageBuffer->convertToLuminanceMask();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_cachedImageBuffer->setSpaceSize(spaceSize());
</del><span class="cx"> destContext->setDrawLuminanceMask(false);
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, styleColorSpace, compositeOp, destRect, blendMode);
</del><ins>+ m_cachedImageBuffer->drawPattern(destContext, adjustedSrcRect, adjustedPatternCTM, phase, spacing, styleColorSpace, compositeOp, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGradientImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GradientImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override;
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> GradientImage(PassRefPtr<Gradient>, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -399,14 +399,13 @@
</span><span class="cx"> image->draw(this, destination, source, colorSpace, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode, imagePaintingOptions.m_orientationDescription);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawTiledImage(Image* image, ColorSpace colorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize,
- const ImagePaintingOptions& imagePaintingOptions)
</del><ins>+void GraphicsContext::drawTiledImage(Image* image, ColorSpace colorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& imagePaintingOptions)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled() || !image)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingOptions.m_useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
</span><del>- image->drawTiled(this, destination, source, tileSize, colorSpace, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode);
</del><ins>+ image->drawTiled(this, destination, source, tileSize, spacing, colorSpace, imagePaintingOptions.m_compositeOperator, imagePaintingOptions.m_blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::drawTiledImage(Image* image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/GraphicsContext.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -310,8 +310,7 @@
</span><span class="cx"> WEBCORE_EXPORT void drawImage(Image*, ColorSpace, const FloatRect& destination, const ImagePaintingOptions& = ImagePaintingOptions());
</span><span class="cx"> void drawImage(Image*, ColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions& = ImagePaintingOptions());
</span><span class="cx">
</span><del>- void drawTiledImage(Image*, ColorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize,
- const ImagePaintingOptions& = ImagePaintingOptions());
</del><ins>+ void drawTiledImage(Image*, ColorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize, const FloatSize& spacing, const ImagePaintingOptions& = ImagePaintingOptions());
</ins><span class="cx"> void drawTiledImage(Image*, ColorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
</span><span class="cx"> Image::TileRule, Image::TileRule, const ImagePaintingOptions& = ImagePaintingOptions());
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode, description);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
</del><ins>+void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (mayFillWithSolidColor()) {
</span><span class="cx"> fillWithSolidColor(ctxt, destRect, solidColor(), styleColorSpace, op);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> scaledTileSize.height() / intrinsicTileSize.height());
</span><span class="cx">
</span><span class="cx"> FloatRect oneTileRect;
</span><del>- FloatSize actualTileSize(scaledTileSize.width() + spaceSize().width(), scaledTileSize.height() + spaceSize().height());
</del><ins>+ FloatSize actualTileSize(scaledTileSize.width() + spacing.width(), scaledTileSize.height() + spacing.height());
</ins><span class="cx"> oneTileRect.setX(destRect.x() + fmodf(fmodf(-srcPoint.x(), actualTileSize.width()) - actualTileSize.width(), actualTileSize.width()));
</span><span class="cx"> oneTileRect.setY(destRect.y() + fmodf(fmodf(-srcPoint.y(), actualTileSize.height()) - actualTileSize.height(), actualTileSize.height()));
</span><span class="cx"> oneTileRect.setSize(scaledTileSize);
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">
</span><span class="cx"> AffineTransform patternTransform = AffineTransform().scaleNonUniform(scale.width(), scale.height());
</span><span class="cx"> FloatRect tileRect(FloatPoint(), intrinsicTileSize);
</span><del>- drawPattern(ctxt, tileRect, patternTransform, oneTileRect.location(), styleColorSpace, op, destRect, blendMode);
</del><ins>+ drawPattern(ctxt, tileRect, patternTransform, oneTileRect.location(), spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> startAnimation(DoNotCatchUp);
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> vPhase -= (dstRect.height() - scaledTileHeight) / 2;
</span><span class="cx"> FloatPoint patternPhase(dstRect.x() - hPhase, dstRect.y() - vPhase);
</span><span class="cx">
</span><del>- drawPattern(ctxt, srcRect, patternTransform, patternPhase, styleColorSpace, op, dstRect);
</del><ins>+ drawPattern(ctxt, srcRect, patternTransform, patternPhase, FloatSize(), styleColorSpace, op, dstRect);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> startAnimation(DoNotCatchUp);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Image.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
</span><span class="cx"> FloatRect adjustSourceRectForDownSampling(const FloatRect& srcRect, const IntSize& scaledSize) const;
</span><span class="lines">@@ -177,11 +177,6 @@
</span><span class="cx"> virtual bool notSolidColor() { return true; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- FloatSize spaceSize() const { return m_space; }
- void setSpaceSize(const FloatSize& space)
- {
- m_space = space;
- }
</del><span class="cx"> protected:
</span><span class="cx"> Image(ImageObserver* = nullptr);
</span><span class="cx">
</span><span class="lines">@@ -192,7 +187,7 @@
</span><span class="cx"> virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) { }
</span><span class="cx"> #endif
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription);
</span><del>- void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, ColorSpace styleColorSpace,
</del><ins>+ void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, const FloatSize& spacing, ColorSpace styleColorSpace,
</ins><span class="cx"> CompositeOperator , BlendMode);
</span><span class="cx"> void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator);
</span><span class="cx">
</span><span class="lines">@@ -203,7 +198,6 @@
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<SharedBuffer> m_encodedImageData;
</span><span class="cx"> ImageObserver* m_imageObserver;
</span><del>- FloatSize m_space;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ImageBuffer.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ImageBuffer.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ImageBuffer.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> // with textures that are RGB or RGBA format, and UNSIGNED_BYTE type.
</span><span class="cx"> bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, bool, bool);
</span><span class="cx">
</span><del>- FloatSize spaceSize() const { return m_space; }
- void setSpaceSize(const FloatSize& space) { m_space = space; }
-
</del><span class="cx"> // These functions are used when clamping the ImageBuffer which is created for filter, masker or clipper.
</span><span class="cx"> static bool sizeNeedsClamping(const FloatSize&);
</span><span class="cx"> static bool sizeNeedsClamping(const FloatSize&, FloatSize& scale);
</span><span class="lines">@@ -144,7 +141,7 @@
</span><span class="cx"> void clip(GraphicsContext*, const FloatRect&) const;
</span><span class="cx">
</span><span class="cx"> void draw(GraphicsContext*, ColorSpace, const FloatRect& destRect, const FloatRect& srcRect = FloatRect(0, 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
</span><del>- void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</del><ins>+ void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
</ins><span class="cx">
</span><span class="cx"> inline void genericConvertToLuminanceMask();
</span><span class="cx">
</span><span class="lines">@@ -159,7 +156,6 @@
</span><span class="cx"> IntSize m_size;
</span><span class="cx"> IntSize m_logicalSize;
</span><span class="cx"> float m_resolutionScale;
</span><del>- FloatSize m_space;
</del><span class="cx">
</span><span class="cx"> // This constructor will place its success into the given out-variable
</span><span class="cx"> // so that create() knows when it should return failure.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NamedImageGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+void NamedImageGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><span class="cx"> // std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> platformTheme()->drawNamedImage(m_name, graphicsContext, FloatRect(0, 0, size().width(), size().height()));
</span><span class="cx">
</span><span class="cx"> // Tile the image buffer into the context.
</span><del>- imageBuffer->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ imageBuffer->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(srcRect);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsNamedImageGeneratedImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</span><del>- virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</del><ins>+ virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& dstRect, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> NamedImageGeneratedImage(String name, const FloatSize&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -196,10 +196,7 @@
</span><span class="cx"> if (!image)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto bitmapImage = BitmapImage::create(image.get());
- bitmapImage->setSpaceSize(spaceSize());
-
- return WTF::move(bitmapImage);
</del><ins>+ return BitmapImage::create(image.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BackingStoreCopy ImageBuffer::fastCopyImageMode()
</span><span class="lines">@@ -247,7 +244,7 @@
</span><span class="cx"> destContext->drawNativeImage(image.get(), m_data.backingStoreSize, colorSpace, destRect, adjustedSrcRect, op, blendMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+void ImageBuffer::drawPattern(GraphicsContext* destContext, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect adjustedSrcRect = srcRect;
</span><span class="cx"> adjustedSrcRect.scale(m_resolutionScale, m_resolutionScale);
</span><span class="lines">@@ -255,14 +252,14 @@
</span><span class="cx"> if (!context()->isAcceleratedContext()) {
</span><span class="cx"> if (destContext == context() || destContext->isAcceleratedContext()) {
</span><span class="cx"> if (RefPtr<Image> copy = copyImage(CopyBackingStore)) // Drawing into our own buffer, need to deep copy.
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> } else {
</span><span class="cx"> if (RefPtr<Image> imageForRendering = copyImage(DontCopyBackingStore))
</span><del>- imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</del><ins>+ imageForRendering->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (RefPtr<Image> copy = copyImage(CopyBackingStore))
</span><del>- copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, styleColorSpace, op, destRect, blendMode);
</del><ins>+ copy->drawPattern(destContext, adjustedSrcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscgImageCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> if (!nativeImageForCurrentFrame())
</span><span class="cx"> return;
</span><span class="lines">@@ -133,11 +133,11 @@
</span><span class="cx"> // Adjust the color space.
</span><span class="cx"> subImage = Image::imageWithColorSpace(subImage.get(), styleColorSpace);
</span><span class="cx">
</span><del>- // If we need to paint gaps between tiles because we have a partially loaded image or non-zero spaceSize(),
</del><ins>+ // If we need to paint gaps between tiles because we have a partially loaded image or non-zero spacing,
</ins><span class="cx"> // fall back to the less efficient CGPattern-based mechanism.
</span><span class="cx"> float scaledTileWidth = tileRect.width() * narrowPrecisionToFloat(patternTransform.a());
</span><span class="cx"> float w = CGImageGetWidth(tileImage);
</span><del>- if (w == size().width() && h == size().height() && !spaceSize().width() && !spaceSize().height())
</del><ins>+ if (w == size().width() && h == size().height() && !spacing.width() && !spacing.height())
</ins><span class="cx"> CGContextDrawTiledImage(context, FloatRect(adjustedX, adjustedY, scaledTileWidth, scaledTileHeight), subImage.get());
</span><span class="cx"> else {
</span><span class="cx"> static const CGPatternCallbacks patternCallbacks = { 0, drawPatternCallback, patternReleaseCallback };
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> CGImageRef platformImage = CGImageRetain(subImage.get());
</span><span class="cx"> RetainPtr<CGPatternRef> pattern = adoptCF(CGPatternCreate(platformImage, CGRectMake(0, 0, tileRect.width(), tileRect.height()), matrix,
</span><del>- tileRect.width() + spaceSize().width() * (1 / narrowPrecisionToFloat(patternTransform.a())),
- tileRect.height() + spaceSize().height() * (1 / narrowPrecisionToFloat(patternTransform.d())),
</del><ins>+ tileRect.width() + spacing.width() * (1 / narrowPrecisionToFloat(patternTransform.a())),
+ tileRect.height() + spacing.height() * (1 / narrowPrecisionToFloat(patternTransform.d())),
</ins><span class="cx"> kCGPatternTilingConstantSpacing, true, &patternCallbacks));
</span><span class="cx">
</span><span class="cx"> if (!pattern)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -848,9 +848,7 @@
</span><span class="cx"> RefPtr<Image> image = bgImage->image(clientForBackgroundImage, geometry.tileSize());
</span><span class="cx"> context->setDrawLuminanceMask(bgLayer->maskSourceType() == MaskLuminance);
</span><span class="cx"> bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
</span><del>- if (image.get())
- image->setSpaceSize(geometry.spaceSize());
- context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), toLayoutPoint(geometry.relativePhase()), geometry.tileSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</del><ins>+ context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), toLayoutPoint(geometry.relativePhase()), geometry.tileSize(), geometry.spaceSize(), ImagePaintingOptions(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -184,8 +184,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize containerSize, float zoom, const FloatRect& srcRect,
- const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize& containerSize, float zoom, const FloatRect& srcRect,
+ const AffineTransform& patternTransform, const FloatPoint& phase, const FloatSize& spacing, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><span class="cx"> FloatRect zoomedContainerRect = FloatRect(FloatPoint(), containerSize);
</span><span class="cx"> zoomedContainerRect.scale(zoom);
</span><span class="lines">@@ -209,7 +209,6 @@
</span><span class="cx"> RefPtr<Image> image = buffer->copyImage(DontCopyBackingStore, Unscaled);
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><del>- image->setSpaceSize(spaceSize());
</del><span class="cx">
</span><span class="cx"> // Adjust the source rect and transform due to the image buffer's scaling.
</span><span class="cx"> FloatRect scaledSrcRect = srcRect;
</span><span class="lines">@@ -218,7 +217,7 @@
</span><span class="cx"> unscaledPatternTransform.scale(1 / imageBufferScale.width(), 1 / imageBufferScale.height());
</span><span class="cx">
</span><span class="cx"> context->setDrawLuminanceMask(false);
</span><del>- image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, colorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ image->drawPattern(context, scaledSrcRect, unscaledPatternTransform, phase, spacing, colorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace, CompositeOperator compositeOp, BlendMode blendMode, ImageOrientationDescription)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvggraphicsSVGImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImage.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -94,9 +94,9 @@
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span><span class="cx">
</span><span class="cx"> SVGImage(ImageObserver&, const URL&);
</span><del>- virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</del><ins>+ virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</ins><span class="cx"> void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode);
</span><del>- void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace,
</del><ins>+ void drawPatternForContainer(GraphicsContext*, const FloatSize& containerSize, float zoom, const FloatRect& srcRect, const AffineTransform&, const FloatPoint& phase, const FloatSize& spacing, ColorSpace,
</ins><span class="cx"> CompositeOperator, const FloatRect&, BlendMode);
</span><span class="cx">
</span><span class="cx"> SVGSVGElement* rootElement() const;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvggraphicsSVGImageForContainercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.cpp (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.cpp 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -41,10 +41,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImageForContainer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span><del>- const FloatPoint& phase, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</del><ins>+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace colorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</ins><span class="cx"> {
</span><del>- m_image->setSpaceSize(spaceSize());
- m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, colorSpace, compositeOp, dstRect, blendMode);
</del><ins>+ m_image->drawPatternForContainer(context, m_containerSize, m_zoom, srcRect, patternTransform, phase, spacing, colorSpace, compositeOp, dstRect, blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassNativeImagePtr SVGImageForContainer::nativeImageForCurrentFrame()
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoresvggraphicsSVGImageForContainerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.h (193885 => 193886)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.h 2015-12-10 02:53:12 UTC (rev 193885)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/graphics/SVGImageForContainer.h 2015-12-10 03:16:43 UTC (rev 193886)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;
</span><span class="cx">
</span><del>- virtual void drawPattern(GraphicsContext*, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace, CompositeOperator, const FloatRect&, BlendMode) override;
</del><ins>+ virtual void drawPattern(GraphicsContext*, const FloatRect&, const AffineTransform&, const FloatPoint&, const FloatSize&, ColorSpace, CompositeOperator, const FloatRect&, BlendMode) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Implement this to be less conservative.
</span><span class="cx"> virtual bool currentFrameKnownToBeOpaque() override { return false; }
</span></span></pre>
</div>
</div>
</body>
</html>