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

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

Issue 1458083002: Support fragment URLs for more kinds of SVG images (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplifications and an added content test 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) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 SVGAnimatedLength* x() const { return m_x.get(); } 45 SVGAnimatedLength* x() const { return m_x.get(); }
46 SVGAnimatedLength* y() const { return m_y.get(); } 46 SVGAnimatedLength* y() const { return m_y.get(); }
47 SVGAnimatedLength* width() const { return m_width.get(); } 47 SVGAnimatedLength* width() const { return m_width.get(); }
48 SVGAnimatedLength* height() const { return m_height.get(); } 48 SVGAnimatedLength* height() const { return m_height.get(); }
49 SVGAnimatedPreserveAspectRatio* preserveAspectRatio() { return m_preserveAsp ectRatio.get(); } 49 SVGAnimatedPreserveAspectRatio* preserveAspectRatio() { return m_preserveAsp ectRatio.get(); }
50 50
51 // Exposed for testing. 51 // Exposed for testing.
52 ImageResource* cachedImage() const { return imageLoader().image(); } 52 ImageResource* cachedImage() const { return imageLoader().image(); }
53 53
54 const AtomicString imageSourceURL() const override;
fs 2015/11/19 14:59:44 Nit: What needs this to be public? (Isn't it acces
davve 2015/11/20 08:14:21 You're very much correct. Left-over from patch set
55
54 private: 56 private:
55 explicit SVGImageElement(Document&); 57 explicit SVGImageElement(Document&);
56 58
57 bool isStructurallyExternal() const override { return !hrefString().isNull() ; } 59 bool isStructurallyExternal() const override { return !hrefString().isNull() ; }
58 60
59 bool isPresentationAttribute(const QualifiedName&) const override; 61 bool isPresentationAttribute(const QualifiedName&) const override;
60 bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const override; 62 bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const override;
61 void collectStyleForPresentationAttribute(const QualifiedName&, const Atomic String&, MutableStylePropertySet*) override; 63 void collectStyleForPresentationAttribute(const QualifiedName&, const Atomic String&, MutableStylePropertySet*) override;
62 64
63 void svgAttributeChanged(const QualifiedName&) override; 65 void svgAttributeChanged(const QualifiedName&) override;
64 66
65 void attach(const AttachContext& = AttachContext()) override; 67 void attach(const AttachContext& = AttachContext()) override;
66 InsertionNotificationRequest insertedInto(ContainerNode*) override; 68 InsertionNotificationRequest insertedInto(ContainerNode*) override;
67 69
68 LayoutObject* createLayoutObject(const ComputedStyle&) override; 70 LayoutObject* createLayoutObject(const ComputedStyle&) override;
69 71
70 const AtomicString imageSourceURL() const override;
71
72 bool haveLoadedRequiredResources() override; 72 bool haveLoadedRequiredResources() override;
73 73
74 bool selfHasRelativeLengths() const override; 74 bool selfHasRelativeLengths() const override;
75 void didMoveToNewDocument(Document& oldDocument) override; 75 void didMoveToNewDocument(Document& oldDocument) override;
76 SVGImageLoader& imageLoader() const { return *m_imageLoader; } 76 SVGImageLoader& imageLoader() const { return *m_imageLoader; }
77 77
78 RefPtrWillBeMember<SVGAnimatedLength> m_x; 78 RefPtrWillBeMember<SVGAnimatedLength> m_x;
79 RefPtrWillBeMember<SVGAnimatedLength> m_y; 79 RefPtrWillBeMember<SVGAnimatedLength> m_y;
80 RefPtrWillBeMember<SVGAnimatedLength> m_width; 80 RefPtrWillBeMember<SVGAnimatedLength> m_width;
81 RefPtrWillBeMember<SVGAnimatedLength> m_height; 81 RefPtrWillBeMember<SVGAnimatedLength> m_height;
82 RefPtrWillBeMember<SVGAnimatedPreserveAspectRatio> m_preserveAspectRatio; 82 RefPtrWillBeMember<SVGAnimatedPreserveAspectRatio> m_preserveAspectRatio;
83 83
84 OwnPtrWillBeMember<SVGImageLoader> m_imageLoader; 84 OwnPtrWillBeMember<SVGImageLoader> m_imageLoader;
85 bool m_needsLoaderURIUpdate : 1; 85 bool m_needsLoaderURIUpdate : 1;
86 }; 86 };
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // SVGImageElement_h 90 #endif // SVGImageElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698