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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index aa802699c0672e343486fed51397b52c58299c9f..df4b670d4ae5249e984850241eac35aac17689ee 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2015-10-30  Dan Bernstein  <mitz@apple.com>
+
+        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  <beidson@apple.com>
 
         Modern IDB: IDBObjectStore.add() support.

diff --git a/Source/WebCore/platform/graphics/Image.cpp b/Source/WebCore/platform/graphics/Image.cpp
index f9971a0b709b5b47213d0bff900dbcb5dc5aa5e9..4e3d6152f658aa0909ee70b269703bc528e60cd3 100644 (file)
--- a/Source/WebCore/platform/graphics/Image.cpp
+++ b/Source/WebCore/platform/graphics/Image.cpp
@@ -90,11 +90,6 @@ void Image::fillWithSolidColor(GraphicsContext& ctxt, const FloatRect& dstRect,
     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()) {

diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
index 9c65dabe587aea4414bb393457480020a258078e..a5b1e4ae3dcfe9761630a30a5645288e6d1465ca 100644 (file)
--- a/Source/WebCore/platform/graphics/Image.h
+++ b/Source/WebCore/platform/graphics/Image.h
@@ -192,7 +192,7 @@ protected:
 #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);