OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) |
6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. |
8 * Copyright (C) 2010 Google Inc. All rights reserved. | 8 * Copyright (C) 2010 Google Inc. All rights reserved. |
9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. | 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. |
10 * | 10 * |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
196 void RenderImage::notifyFinished(Resource* newImage) | 196 void RenderImage::notifyFinished(Resource* newImage) |
197 { | 197 { |
198 if (!m_imageResource) | 198 if (!m_imageResource) |
199 return; | 199 return; |
200 | 200 |
201 if (documentBeingDestroyed()) | 201 if (documentBeingDestroyed()) |
202 return; | 202 return; |
203 | 203 |
204 invalidateBackgroundObscurationStatus(); | 204 invalidateBackgroundObscurationStatus(); |
205 | 205 |
206 if (newImage == m_imageResource->cachedImage()) { | 206 ImageResource* image = m_imageResource->cachedImage(); |
207 if (newImage == image) { | |
207 // tell any potential compositing layers | 208 // tell any potential compositing layers |
208 // that the image is done and they can reference it directly. | 209 // that the image is done and they can reference it directly. |
209 contentChanged(ImageChanged); | 210 contentChanged(ImageChanged); |
210 } | 211 } |
212 | |
213 if (image) | |
214 image->updateImageAnimationPolicy(); | |
fs
2015/02/02 10:31:26
This doesn't appear to cover all the cases compare
| |
211 } | 215 } |
212 | 216 |
213 void RenderImage::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset) | 217 void RenderImage::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset) |
214 { | 218 { |
215 ImagePainter(*this).paintReplaced(paintInfo, paintOffset); | 219 ImagePainter(*this).paintReplaced(paintInfo, paintOffset); |
216 } | 220 } |
217 | 221 |
218 void RenderImage::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs et) | 222 void RenderImage::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs et) |
219 { | 223 { |
220 ImagePainter(*this).paint(paintInfo, paintOffset); | 224 ImagePainter(*this).paint(paintInfo, paintOffset); |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
388 return 0; | 392 return 0; |
389 | 393 |
390 ImageResource* cachedImage = m_imageResource->cachedImage(); | 394 ImageResource* cachedImage = m_imageResource->cachedImage(); |
391 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) | 395 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage( )) |
392 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 396 return toSVGImage(cachedImage->image())->embeddedContentBox(); |
393 | 397 |
394 return 0; | 398 return 0; |
395 } | 399 } |
396 | 400 |
397 } // namespace blink | 401 } // namespace blink |
OLD | NEW |