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

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

Issue 1720853002: Remove Image::computeIntrinsicDimensions() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-and-use-updateconcretesize-upload
Patch Set: Avoid using the size of the error image. Null-check in ImageResource saved the day in previous patc… Created 4 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 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 FloatSize containerSizeWithoutZoom(containerSize); 42 FloatSize containerSizeWithoutZoom(containerSize);
43 containerSizeWithoutZoom.scale(1 / zoom); 43 containerSizeWithoutZoom.scale(1 / zoom);
44 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom, url)); 44 return adoptRef(new SVGImageForContainer(image, containerSizeWithoutZoom , zoom, url));
45 } 45 }
46 46
47 bool isTextureBacked() override; 47 bool isTextureBacked() override;
48 IntSize size() const override; 48 IntSize size() const override;
49 49
50 bool usesContainerSize() const override { return m_image->usesContainerSize( ); } 50 bool usesContainerSize() const override { return m_image->usesContainerSize( ); }
51 bool hasRelativeSize() const override { return m_image->hasRelativeSize(); } 51 bool hasRelativeSize() const override { return m_image->hasRelativeSize(); }
52 void computeIntrinsicDimensions(FloatSize& intrinsicSize, FloatSize& intrins icRatio) override
53 {
54 m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
55 }
56 52
57 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override; 53 void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, Res pectImageOrientationEnum, ImageClampingMode) override;
58 54
59 void drawPattern(GraphicsContext&, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const FloatSize& repeatSpacing ) override; 55 void drawPattern(GraphicsContext&, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const FloatSize& repeatSpacing ) override;
60 56
61 // FIXME: Implement this to be less conservative. 57 // FIXME: Implement this to be less conservative.
62 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override { return false; } 58 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override { return false; }
63 59
64 PassRefPtr<SkImage> imageForCurrentFrame() override; 60 PassRefPtr<SkImage> imageForCurrentFrame() override;
65 61
66 private: 62 private:
67 SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom, const KURL& url) 63 SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom, const KURL& url)
68 : m_image(image) 64 : m_image(image)
69 , m_containerSize(containerSize) 65 , m_containerSize(containerSize)
70 , m_zoom(zoom) 66 , m_zoom(zoom)
71 , m_url(url) 67 , m_url(url)
72 { 68 {
73 } 69 }
74 70
75 void destroyDecodedData(bool) override { } 71 void destroyDecodedData(bool) override { }
76 72
77 SVGImage* m_image; 73 SVGImage* m_image;
78 const FloatSize m_containerSize; 74 const FloatSize m_containerSize;
79 const float m_zoom; 75 const float m_zoom;
80 const KURL m_url; 76 const KURL m_url;
81 }; 77 };
82 } // namespace blink 78 } // namespace blink
83 79
84 #endif // SVGImageForContainer_h 80 #endif // SVGImageForContainer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698