OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org> | 2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org> |
3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> | 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> |
4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> | 4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> |
5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> | 5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> |
6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> | 6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> |
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. |
8 * Copyright (C) 2010 Google Inc. All rights reserved. | 8 * Copyright (C) 2010 Google Inc. All rights reserved. |
9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> | 9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> |
10 * | 10 * |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, ImageResource::IntrinsicSize); | 97 LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, mu ltiplier, ImageResource::IntrinsicSize); |
98 if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && siz e.height()) | 98 if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && siz e.height()) |
99 size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio()); | 99 size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio()); |
100 return size; | 100 return size; |
101 } | 101 } |
102 | 102 |
103 PassRefPtr<Image> LayoutImageResource::image(const IntSize& containerSize, float zoom) const | 103 PassRefPtr<Image> LayoutImageResource::image(const IntSize& containerSize, float zoom) const |
104 { | 104 { |
105 RefPtr<Image> image = m_cachedImage ? m_cachedImage->image() : Image::nullIm age(); | 105 RefPtr<Image> image = m_cachedImage ? m_cachedImage->image() : Image::nullIm age(); |
106 if (image->isSVGImage()) { | 106 if (image->isSVGImage()) { |
107 KURL url; | |
107 SVGImage* svgImage = toSVGImage(image.get()); | 108 SVGImage* svgImage = toSVGImage(image.get()); |
108 Node* node = m_layoutObject->node(); | 109 Node* node = m_layoutObject->node(); |
109 if (node && isHTMLImageElement(node)) { | 110 if (node && node->isElementNode()) { |
110 const AtomicString& urlString = toHTMLImageElement(node)->imageSourc eURL(); | 111 const AtomicString& urlString = toElement(node)->imageSourceURL(); |
fs
2015/11/19 14:59:44
Nit: With this change I guess the include of HTMLI
davve
2015/11/20 08:14:21
Thanks.
| |
111 KURL url = node->document().completeURL(urlString); | 112 url = node->document().completeURL(urlString); |
112 svgImage->setURL(url); | |
113 } | 113 } |
114 return SVGImageForContainer::create(svgImage, containerSize, zoom); | 114 return SVGImageForContainer::create(svgImage, containerSize, zoom, url); |
115 } | 115 } |
116 return image; | 116 return image; |
117 } | 117 } |
118 | 118 |
119 bool LayoutImageResource::maybeAnimated() const | 119 bool LayoutImageResource::maybeAnimated() const |
120 { | 120 { |
121 Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage(); | 121 Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage(); |
122 return image->maybeAnimated(); | 122 return image->maybeAnimated(); |
123 } | 123 } |
124 | 124 |
125 } // namespace blink | 125 } // namespace blink |
OLD | NEW |