Merge 143541

Source/WebCore/svg/graphics/SVGImageForContainer.h

 /*
  * Copyright (C) 2013 Google 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "AffineTransform.h"
 #include "FloatRect.h"
 #include "FloatSize.h"
 #include "Image.h"
 #include "SVGImage.h"
 
 namespace WebCore {
 
 class SVGImageForContainer : public Image {
 public:
-    static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatSize& containerSize, float pageScale, float zoom)
+    static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatSize& containerSize, float zoom)
     {
-        return adoptRef(new SVGImageForContainer(image, containerSize, pageScale, zoom));
+        return adoptRef(new SVGImageForContainer(image, containerSize, zoom));
     }
 
     virtual bool isSVGImage() const OVERRIDE { return true; }
 
     virtual IntSize size() const OVERRIDE;
 
     virtual bool usesContainerSize() const OVERRIDE { return m_image->usesContainerSize(); }
     virtual bool hasRelativeWidth() const OVERRIDE { return m_image->hasRelativeWidth(); }
     virtual bool hasRelativeHeight() const OVERRIDE { return m_image->hasRelativeHeight(); }
     virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE
     {
         m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
     }
 
     virtual void draw(GraphicsContext*, const FloatRect&, const FloatRect&, ColorSpace, CompositeOperator, BlendMode) OVERRIDE;
 
     virtual void drawPattern(GraphicsContext*, const FloatRect&, const AffineTransform&, const FloatPoint&, ColorSpace, CompositeOperator, const FloatRect&) OVERRIDE;
 
     // FIXME: Implement this to be less conservative.
     virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
 
-    FloatSize containerSize() { return m_containerSize; }
-    float pageScale() { return m_pageScale; }
-    float zoom() { return m_zoom; }
-
-    void setSize(FloatSize& size) { m_containerSize = size; }
-    void setZoom(float zoom) { m_zoom = zoom; }
-    void setPageScale(float pageScale) { m_pageScale = pageScale; }
-
 private:
-    SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float pageScale, float zoom)
-        : m_image(image), m_containerSize(containerSize), m_pageScale(pageScale), m_zoom(zoom) { }
+    SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom)
+        : m_image(image)
+        , m_containerSize(containerSize)
+        , m_zoom(zoom)
+    {
+    }
 
     virtual void destroyDecodedData(bool /*destroyAll*/ = true) { }
     virtual unsigned decodedSize() const { return 0; }
 
     SVGImage* m_image;
-    FloatSize m_containerSize;
-    float m_pageScale;
-    float m_zoom;
+    const FloatSize m_containerSize;
+    const float m_zoom;
 };
 }
 
 #endif // ENABLE(SVG)
 #endif // SVGImageForContainer_h