Modified: trunk/Source/WebCore/ChangeLog (191798 => 191799)
--- trunk/Source/WebCore/ChangeLog 2015-10-30 17:58:49 UTC (rev 191798)
+++ trunk/Source/WebCore/ChangeLog 2015-10-30 18:07:24 UTC (rev 191799)
@@ -1,3 +1,13 @@
+2015-10-30 Dan Bernstein <[email protected]>
+
+ Fixed the build.
+
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::draw): Deleted an infinitely-recursive implementation that caused the
+ compiler to emit an error.
+ * platform/graphics/Image.h:
+ (WebCore::Image::draw): Made this pure virtual.
+
2015-10-30 Brady Eidson <[email protected]>
Modern IDB: IDBObjectStore.add() support.
Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (191798 => 191799)
--- trunk/Source/WebCore/platform/graphics/Image.cpp 2015-10-30 17:58:49 UTC (rev 191798)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2015-10-30 18:07:24 UTC (rev 191799)
@@ -90,11 +90,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: trunk/Source/WebCore/platform/graphics/Image.h (191798 => 191799)
--- trunk/Source/WebCore/platform/graphics/Image.h 2015-10-30 17:58:49 UTC (rev 191798)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2015-10-30 18:07:24 UTC (rev 191799)
@@ -192,7 +192,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);
