Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193976 => 193977)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 21:55:56 UTC (rev 193976)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 21:55:59 UTC (rev 193977)
@@ -1,5 +1,22 @@
2015-12-11 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190914. rdar://problem/23732405
+
+ 2015-12-09 Simon Fraser <simon.fra...@apple.com>
+
+ Merge r190914. rdar://problem/23432368
+
+ 2015-10-12 Simon Fraser <simon.fra...@apple.com>
+
+ Speculative Cairo build fixes after r190910.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::drawPattern):
+ * platform/graphics/cairo/ImageCairo.cpp:
+ (WebCore::Image::drawPattern):
+
+2015-12-11 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190910. rdar://problem/23732405
2015-12-09 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (193976 => 193977)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-12-11 21:55:56 UTC (rev 193976)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-12-11 21:55:59 UTC (rev 193977)
@@ -159,10 +159,10 @@
}
void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
+ const FloatPoint& phase, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
{
if (RefPtr<Image> image = copyImage(DontCopyBackingStore))
- image->drawPattern(context, srcRect, patternTransform, phase, styleColorSpace, op, destRect);
+ image->drawPattern(context, srcRect, patternTransform, phase, spacing, styleColorSpace, op, destRect);
}
void ImageBuffer::platformTransformColorSpace(const Vector<int>& lookUpTable)
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp (193976 => 193977)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp 2015-12-11 21:55:56 UTC (rev 193976)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/ImageCairo.cpp 2015-12-11 21:55:59 UTC (rev 193977)
@@ -42,7 +42,7 @@
namespace WebCore {
void Image::drawPattern(GraphicsContext* context, const FloatRect& tileRect, const AffineTransform& patternTransform,
- const FloatPoint& phase, ColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
+ const FloatPoint& phase, const FloatSize&, ColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode)
{
RefPtr<cairo_surface_t> surface = nativeImageForCurrentFrame();
if (!surface) // If it's too early we won't have an image yet.
