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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 } | 243 } |
244 | 244 |
245 { | 245 { |
246 // FIXME: We should not be allowing paint invalidations during layout. c
rbug.com/339584 | 246 // FIXME: We should not be allowing paint invalidations during layout. c
rbug.com/339584 |
247 AllowPaintInvalidationScope scoper(frameView()); | 247 AllowPaintInvalidationScope scoper(frameView()); |
248 DisableCompositingQueryAsserts disabler; | 248 DisableCompositingQueryAsserts disabler; |
249 invalidatePaintRectangle(paintInvalidationRect); | 249 invalidatePaintRectangle(paintInvalidationRect); |
250 } | 250 } |
251 | 251 |
252 // Tell any potential compositing layers that the image needs updating. | 252 // Tell any potential compositing layers that the image needs updating. |
253 contentChanged(ImageChanged); | 253 contentChanged(ImageChanged, enclosingIntRect(paintInvalidationRect)); |
254 } | 254 } |
255 | 255 |
256 void RenderImage::notifyFinished(Resource* newImage) | 256 void RenderImage::notifyFinished(Resource* newImage) |
257 { | 257 { |
258 if (!m_imageResource) | 258 if (!m_imageResource) |
259 return; | 259 return; |
260 | 260 |
261 if (documentBeingDestroyed()) | 261 if (documentBeingDestroyed()) |
262 return; | 262 return; |
263 | 263 |
264 invalidateBackgroundObscurationStatus(); | 264 invalidateBackgroundObscurationStatus(); |
265 | 265 |
266 if (newImage == m_imageResource->cachedImage()) { | 266 if (newImage == m_imageResource->cachedImage()) { |
267 // tell any potential compositing layers | 267 // tell any potential compositing layers |
268 // that the image is done and they can reference it directly. | 268 // that the image is done and they can reference it directly. |
269 contentChanged(ImageChanged); | 269 contentChanged(ImageChanged, IntRect()); |
270 } | 270 } |
271 } | 271 } |
272 | 272 |
273 void RenderImage::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& p
aintOffset) | 273 void RenderImage::paintReplaced(const PaintInfo& paintInfo, const LayoutPoint& p
aintOffset) |
274 { | 274 { |
275 ImagePainter(*this).paintReplaced(paintInfo, paintOffset); | 275 ImagePainter(*this).paintReplaced(paintInfo, paintOffset); |
276 } | 276 } |
277 | 277 |
278 void RenderImage::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) | 278 void RenderImage::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffs
et) |
279 { | 279 { |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 return 0; | 459 return 0; |
460 | 460 |
461 ImageResource* cachedImage = m_imageResource->cachedImage(); | 461 ImageResource* cachedImage = m_imageResource->cachedImage(); |
462 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 462 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) |
463 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 463 return toSVGImage(cachedImage->image())->embeddedContentBox(); |
464 | 464 |
465 return 0; | 465 return 0; |
466 } | 466 } |
467 | 467 |
468 } // namespace blink | 468 } // namespace blink |
OLD | NEW |