Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198429 => 198430)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 17:58:45 UTC (rev 198429)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 18:00:19 UTC (rev 198430)
@@ -1,3 +1,13 @@
+2016-03-18 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix.
+
+ Get rid of infinitely recursive 'draw' implementation.
+
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::draw): Deleted.
+ * platform/graphics/Image.h:
+
2016-03-18 Babak Shafiei <[email protected]>
Merge r198377.
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/Image.cpp (198429 => 198430)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/Image.cpp 2016-03-18 17:58:45 UTC (rev 198429)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/Image.cpp 2016-03-18 18:00:19 UTC (rev 198430)
@@ -89,11 +89,6 @@
ctxt->setCompositeOperation(previousOperator);
}
-void Image::draw(GraphicsContext* ctx, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription description)
-{
- draw(ctx, dstRect, srcRect, styleColorSpace, op, blendMode, description);
-}
-
void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, ColorSpace styleColorSpace, CompositeOperator op, BlendMode blendMode)
{
if (mayFillWithSolidColor()) {
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/Image.h (198429 => 198430)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/Image.h 2016-03-18 17:58:45 UTC (rev 198429)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/Image.h 2016-03-18 18:00:19 UTC (rev 198430)
@@ -186,7 +186,7 @@
#if PLATFORM(WIN)
virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator) { }
#endif
- virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription);
+ virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) = 0;
void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, const FloatSize& spacing, ColorSpace styleColorSpace,
CompositeOperator , BlendMode);
void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator);
