Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Unified Diff: third_party/WebKit/Source/core/svg/graphics/SVGImage.h

Issue 1695243004: Prepare SVGImage for the default sizing algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use has{Width,Height} properties instead of checking larger than zero. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.h
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.h b/third_party/WebKit/Source/core/svg/graphics/SVGImage.h
index c2009f217fc06e7d7a7b924d8382471624aad106..a2c4820940c880b2a06b0111059c8f061f87bbd9 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.h
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.h
@@ -55,7 +55,7 @@ public:
bool isSVGImage() const override { return true; }
bool isTextureBacked() override { return false; }
- IntSize size() const override { return m_intrinsicSize; }
+ IntSize size() const override { return m_concreteObjectSize; }
bool currentFrameHasSingleSecurityOrigin() const override;
@@ -90,6 +90,7 @@ private:
String filenameExtension() const override;
+ FloatSize calculateConcreteObjectSize(const FloatSize&) const;
pdr. 2016/02/23 04:42:28 Is this FloatSize parameter needed? Can you just r
davve 2016/02/23 08:34:37 I agree is looks a bit silly now, but it's used in
IntSize containerSize() const;
bool usesContainerSize() const override { return true; }
void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
@@ -114,7 +115,7 @@ private:
OwnPtrWillBePersistent<SVGImageChromeClient> m_chromeClient;
OwnPtrWillBePersistent<Page> m_page;
- IntSize m_intrinsicSize;
+ IntSize m_concreteObjectSize;
pdr. 2016/02/23 04:42:28 Can you add a comment here describing what the con
davve 2016/02/23 08:34:37 I copy a snippet from the spec and provide a link.
};
DEFINE_IMAGE_TYPE_CASTS(SVGImage);

Powered by Google App Engine
This is Rietveld 408576698