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

Unified Diff: Source/WebCore/svg/graphics/SVGImage.h

Issue 13008026: Merge 146227 "Separate SVG image size and container size" (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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: Source/WebCore/svg/graphics/SVGImage.h
===================================================================
--- Source/WebCore/svg/graphics/SVGImage.h (revision 146634)
+++ Source/WebCore/svg/graphics/SVGImage.h (working copy)
@@ -51,7 +51,7 @@
FrameView* frameView() const;
virtual bool isSVGImage() const { return true; }
- virtual IntSize size() const;
+ virtual IntSize size() const OVERRIDE { return m_intrinsicSize; }
virtual bool hasRelativeWidth() const;
virtual bool hasRelativeHeight() const;
@@ -71,6 +71,7 @@
virtual String filenameExtension() const;
virtual void setContainerSize(const IntSize&);
+ IntSize containerSize() const;
virtual bool usesContainerSize() const { return true; }
virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
@@ -94,6 +95,7 @@
OwnPtr<SVGImageChromeClient> m_chromeClient;
OwnPtr<Page> m_page;
+ IntSize m_intrinsicSize;
};
}
« no previous file with comments | « LayoutTests/svg/as-image/svg-container-size-after-reload-expected.txt ('k') | Source/WebCore/svg/graphics/SVGImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698