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

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

Issue 1339183003: NOT FOR LANDING Experiment with allocating SVGImageForContainer on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 3 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 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 18 matching lines...) Expand all
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 public: 38 public:
39 static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatS ize& containerSize, float zoom) 39 static PassRefPtr<SVGImageForContainer> create(SVGImage* image, const FloatS ize& containerSize, float zoom, const KURL& urlWithFragment)
40 { 40 {
41 return adoptRef(new SVGImageForContainer(image, containerSize, zoom)); 41 FloatSize containerSizeWithoutZoom(containerSize);
42 containerSizeWithoutZoom.scale(1 / zoom);
43 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom, urlWithFragment));
42 } 44 }
43 45
44 bool isSVGImage() const override { return true; } 46 bool isSVGImage() const override { return true; }
45 47
46 IntSize size() const override; 48 IntSize size() const override;
47 void setURL(const KURL& url) { m_image->setURL(url); }
48 49
49 bool usesContainerSize() const override { return m_image->usesContainerSize( ); } 50 bool usesContainerSize() const override { return m_image->usesContainerSize( ); }
50 bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); } 51 bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
51 bool hasRelativeHeight() const override { return m_image->hasRelativeHeight( ); } 52 bool hasRelativeHeight() const override { return m_image->hasRelativeHeight( ); }
52 void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHei ght, FloatSize& intrinsicRatio) override 53 void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHei ght, FloatSize& intrinsicRatio) override
53 { 54 {
54 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, int rinsicRatio); 55 m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, int rinsicRatio);
55 } 56 }
56 57
57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override; 58 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override;
58 59
59 void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing) override; 60 void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing) override;
60 61
61 // FIXME: Implement this to be less conservative. 62 // FIXME: Implement this to be less conservative.
62 bool currentFrameKnownToBeOpaque() override { return false; } 63 bool currentFrameKnownToBeOpaque() override { return false; }
63 64
64 PassRefPtr<SkImage> imageForCurrentFrame() override; 65 PassRefPtr<SkImage> imageForCurrentFrame() override;
65 66
66 private: 67 private:
67 SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom) 68 SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom, const KURL& urlWithFragment)
68 : m_image(image) 69 : m_image(image)
69 , m_containerSize(containerSize) 70 , m_containerSize(containerSize)
70 , m_zoom(zoom) 71 , m_zoom(zoom)
72 , m_urlWithFragment(urlWithFragment)
71 { 73 {
72 } 74 }
73 75
74 void destroyDecodedData(bool) override { } 76 void destroyDecodedData(bool) override { }
75 77
76 SVGImage* m_image; 78 SVGImage* m_image;
77 const FloatSize m_containerSize; 79 const FloatSize m_containerSize;
78 const float m_zoom; 80 const float m_zoom;
81 KURL m_urlWithFragment; // Just keep the fragment?
79 }; 82 };
83
80 } 84 }
81 85
82 #endif // SVGImageForContainer_h 86 #endif // SVGImageForContainer_h
OLDNEW
« no previous file with comments | « Source/core/svg/graphics/SVGImage.cpp ('k') | Source/core/svg/graphics/SVGImageForContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698