Merge image sizing algorithms

third_party/WebKit/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 37 matching lines @@
     {
         return adoptRef(new SVGImage(observer));
     }
 
     static bool isInSVGImage(const Node*);
 
     LayoutBox* embeddedContentBox() const;
 
     bool isSVGImage() const override { return true; }
     bool isTextureBacked() override { return false; }
-    IntSize size() const override { return m_concreteObjectSize; }
+    IntSize size() const override { return m_intrinsicSize; }
 
     bool currentFrameHasSingleSecurityOrigin() const override;
 
     void startAnimation(CatchUpAnimation = CatchUp) override;
     void stopAnimation() override;
     void resetAnimation() override;
 
     // Advances an animated image. This will trigger an animation update for CSS
     // and advance the SMIL timeline by one frame.
     void advanceAnimationForTesting() override;
 
     PassRefPtr<SkImage> imageForCurrentFrame() override;
 
     // Returns the SVG image document's frame.
     FrameView* frameView() const;
 
     // Does the SVG image/document contain any animations?
     bool hasAnimations() const;
 
     void updateUseCounters(Document&) const;
 
+    FloatSize calculateConcreteObjectSize(const FloatSize&) const;
+
     // DisplayItemClient methods.
     String debugName() const final { return "SVGImage"; }
     LayoutRect visualRect() const override;
 
 private:
     friend class AXLayoutObject;
     friend class SVGImageChromeClient;
     friend class SVGImageForContainer;
 
     ~SVGImage() override;
 
     String filenameExtension() const override;
 
-    FloatSize calculateConcreteObjectSize(const FloatSize&) const;
     IntSize containerSize() const;
     bool usesContainerSize() const override { return true; }
     void computeIntrinsicDimensions(FloatSize& intrinsicSize, FloatSize& intrinsicRatio) override;
 
     bool dataChanged(bool allDataReceived) override;
 
     // FIXME: SVGImages are underreporting decoded sizes and will be unable
     // to prune because these functions are not implemented yet.
     void destroyDecodedData(bool) override { }
 
     // FIXME: Implement this to be less conservative.
     bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override { return false; }
 
     SVGImage(ImageObserver*);
     void draw(SkCanvas*, const SkPaint&, const FloatRect& fromRect, const FloatRect& toRect, RespectImageOrientationEnum, ImageClampingMode) override;
     void drawForContainer(SkCanvas*, const SkPaint&, const FloatSize, float, const FloatRect&, const FloatRect&, const KURL&);
     void drawPatternForContainer(GraphicsContext&, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&,
         SkXfermode::Mode, const FloatRect&, const FloatSize& repeatSpacing, const KURL&);
     PassRefPtr<SkImage> imageForCurrentFrameForContainer(const KURL&);
     void drawInternal(SkCanvas*, const SkPaint&, const FloatRect& fromRect, const FloatRect& toRect, RespectImageOrientationEnum,
         ImageClampingMode, const KURL&);
 
     OwnPtrWillBePersistent<SVGImageChromeClient> m_chromeClient;
     OwnPtrWillBePersistent<Page> m_page;
 
-    // "The concrete object size is the result of combining an
-    // object’s intrinsic dimensions and specified size with the
-    // default object size of the context it’s used in, producing a
-    // rectangle with a definite width and height."
-    //
-    // https://drafts.csswg.org/css-images-3/#concrete-object-size
-    //
-    // Note: For SVGImage there are no specified size
-    // constraints. Such constraints are handled by the layout
-    // machinery in LayoutReplaced. An image has only intrinsic size,
-    // aspect ratio and default object size to consider.
-    IntSize m_concreteObjectSize;
+    // When an SVG image has no intrinsic size the size depends on the
+    // default object size, which in turn depends on the
+    // container. SVGImage may belong to multiple containers so the
+    // final image size can't be known in
+    // SVGImage. SVGImageForContainer carried the final image size,

[fs, 2016/03/03 15:22:53]

Nit: s/carried/carries/?

+    // also called concrete object size.
+    IntSize m_intrinsicSize;
 };
 
 DEFINE_IMAGE_TYPE_CASTS(SVGImage);
 
 class ImageObserverDisabler {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(ImageObserverDisabler);
 public:
     ImageObserverDisabler(Image* image)
         : m_image(image)
     {
         m_observer = m_image->imageObserver();
         m_image->setImageObserver(0);
     }
 
     ~ImageObserverDisabler()
     {
         m_image->setImageObserver(m_observer);
     }
 private:
     Image* m_image;
     RawPtrWillBeMember<ImageObserver> m_observer;
 };
 
 } // namespace blink
 
 #endif // SVGImage_h