Generalize ImageForContainer

Source/core/svg/graphics/SVGImage.h

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 49 matching lines @@
 
     virtual void startAnimation(bool /*catchUpIfNecessary*/ = true) OVERRIDE;
     virtual void stopAnimation() OVERRIDE;
     virtual void resetAnimation() OVERRIDE;
 
     virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE;
 
 private:
     friend class AccessibilityRenderObject;
     friend class SVGImageChromeClient;
-    friend class SVGImageForContainer;
+    friend class ImageForContainer;
 
     virtual ~SVGImage();
 
     // Returns the SVG image document's frame.
     FrameView* frameView() const;
 
     virtual String filenameExtension() const OVERRIDE;
 
     virtual void setContainerSize(const IntSize&) OVERRIDE;
     IntSize containerSize() const;
     virtual bool usesContainerSize() const OVERRIDE { return true; }
     virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE;
 
     virtual bool dataChanged(bool allDataReceived) OVERRIDE;
 
     // FIXME: SVGImages are underreporting decoded sizes and will be unable
     // to prune because these functions are not implemented yet.
     virtual void destroyDecodedData(bool) OVERRIDE { }
     virtual unsigned decodedSize() const OVERRIDE { return 0; }
 
     // FIXME: Implement this to be less conservative.
     virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
 
     SVGImage(ImageObserver*);
     virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRect& toRect, CompositeOperator, BlendMode) OVERRIDE;
-    void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, CompositeOperator, BlendMode);
-    void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&,
-        CompositeOperator, const FloatRect&, BlendMode);
+    virtual void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatRect&, CompositeOperator, BlendMode) OVERRIDE;
+    virtual void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&,
+        CompositeOperator, const FloatRect&, BlendMode) OVERRIDE;
 
     OwnPtr<SVGImageChromeClient> m_chromeClient;
     OwnPtr<Page> m_page;
     IntSize m_intrinsicSize;
 };
 
 inline SVGImage* toSVGImage(Image* image)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!image || image->isSVGImage());
     return static_cast<SVGImage*>(image);
@@ skipping 15 matching lines @@
         m_image->setImageObserver(m_observer);
     }
 private:
     Image* m_image;
     ImageObserver* m_observer;
 };
 
 }
 
 #endif // SVGImage_h