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

Side by Side Diff: third_party/WebKit/Source/core/svg/graphics/SVGImageForContainer.h

Issue 1427943002: Wrap SVGImage for container during paint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use IntSize for SVGImageForContainer Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 28
29 #include "core/svg/graphics/SVGImage.h" 29 #include "core/svg/graphics/SVGImage.h"
30 #include "platform/geometry/FloatRect.h" 30 #include "platform/geometry/FloatRect.h"
31 #include "platform/geometry/FloatSize.h" 31 #include "platform/geometry/FloatSize.h"
32 #include "platform/graphics/Image.h" 32 #include "platform/graphics/Image.h"
33 #include "platform/weborigin/KURL.h" 33 #include "platform/weborigin/KURL.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class SVGImageForContainer final : public Image { 37 class SVGImageForContainer final : public Image {
38 USING_FAST_MALLOC(SVGImageForContainer);
38 public: 39 public:
39 static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatS ize& containerSize, float zoom) 40 static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const IntSiz e& containerSize, float zoom)
40 { 41 {
41 return adoptRef(new SVGImageForContainer(image, containerSize, zoom)); 42 FloatSize containerSizeWithoutZoom(containerSize);
43 containerSizeWithoutZoom.scale(1 / zoom);
44 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom));
42 } 45 }
43 46
44 bool isSVGImage() const override { return true; }
45
46 IntSize size() const override; 47 IntSize size() const override;
47 void setURL(const KURL& url) { m_image->setURL(url); }
48 48
49 bool usesContainerSize() const override { return m_image->usesContainerSize( ); } 49 bool usesContainerSize() const override { return m_image->usesContainerSize( ); }
50 bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); } 50 bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
51 bool hasRelativeHeight() const override { return m_image->hasRelativeHeight( ); } 51 bool hasRelativeHeight() const override { return m_image->hasRelativeHeight( ); }
52 void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHei ght, FloatSize& intrinsicRatio) override 52 void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHei ght, FloatSize& intrinsicRatio) override
53 { 53 {
54 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, int rinsicRatio); 54 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, int rinsicRatio);
55 } 55 }
56 56
57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override; 57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override;
(...skipping 15 matching lines...) Expand all
73 73
74 void destroyDecodedData(bool) override { } 74 void destroyDecodedData(bool) override { }
75 75
76 SVGImage* m_image; 76 SVGImage* m_image;
77 const FloatSize m_containerSize; 77 const FloatSize m_containerSize;
78 const float m_zoom; 78 const float m_zoom;
79 }; 79 };
80 } 80 }
81 81
82 #endif // SVGImageForContainer_h 82 #endif // SVGImageForContainer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698