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. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. |
8 * All rights reserved. | 8 * All rights reserved. |
9 * Copyright (C) 2010 Google Inc. All rights reserved. | 9 * Copyright (C) 2010 Google Inc. All rights reserved. |
10 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> | 10 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 if (!cached_image_) | 87 if (!cached_image_) |
88 return LayoutSize(); | 88 return LayoutSize(); |
89 LayoutSize size = cached_image_->ImageSize( | 89 LayoutSize size = cached_image_->ImageSize( |
90 LayoutObject::ShouldRespectImageOrientation(layout_object_), multiplier); | 90 LayoutObject::ShouldRespectImageOrientation(layout_object_), multiplier); |
91 if (layout_object_ && layout_object_->IsLayoutImage() && size.Width() && | 91 if (layout_object_ && layout_object_->IsLayoutImage() && size.Width() && |
92 size.Height()) | 92 size.Height()) |
93 size.Scale(ToLayoutImage(layout_object_)->ImageDevicePixelRatio()); | 93 size.Scale(ToLayoutImage(layout_object_)->ImageDevicePixelRatio()); |
94 return size; | 94 return size; |
95 } | 95 } |
96 | 96 |
97 PassRefPtr<Image> LayoutImageResource::GetImage(const IntSize& container_size, | 97 PassRefPtr<Image> LayoutImageResource::GetImage( |
98 float zoom) const { | 98 const IntSize& container_size) const { |
99 if (!cached_image_) | 99 if (!cached_image_) |
100 return Image::NullImage(); | 100 return Image::NullImage(); |
101 | 101 |
102 if (!cached_image_->GetImage()->IsSVGImage()) | 102 if (!cached_image_->GetImage()->IsSVGImage()) |
103 return cached_image_->GetImage(); | 103 return cached_image_->GetImage(); |
104 | 104 |
105 KURL url; | 105 KURL url; |
106 SVGImage* svg_image = ToSVGImage(cached_image_->GetImage()); | 106 SVGImage* svg_image = ToSVGImage(cached_image_->GetImage()); |
107 Node* node = layout_object_->GetNode(); | 107 Node* node = layout_object_->GetNode(); |
108 if (node && node->IsElementNode()) { | 108 if (node && node->IsElementNode()) { |
109 const AtomicString& url_string = ToElement(node)->ImageSourceURL(); | 109 const AtomicString& url_string = ToElement(node)->ImageSourceURL(); |
110 url = node->GetDocument().CompleteURL(url_string); | 110 url = node->GetDocument().CompleteURL(url_string); |
111 } | 111 } |
112 return SVGImageForContainer::Create(svg_image, container_size, zoom, url); | 112 return SVGImageForContainer::Create( |
| 113 svg_image, container_size, layout_object_->StyleRef().EffectiveZoom(), |
| 114 url); |
113 } | 115 } |
114 | 116 |
115 bool LayoutImageResource::MaybeAnimated() const { | 117 bool LayoutImageResource::MaybeAnimated() const { |
116 Image* image = cached_image_ ? cached_image_->GetImage() : Image::NullImage(); | 118 Image* image = cached_image_ ? cached_image_->GetImage() : Image::NullImage(); |
117 return image->MaybeAnimated(); | 119 return image->MaybeAnimated(); |
118 } | 120 } |
119 | 121 |
120 } // namespace blink | 122 } // namespace blink |
OLD | NEW |