| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 paintInvalidationRect = enclosingIntRect(mapRect(*rect, FloatRect(FloatP
oint(), m_imageResource->imageSize()), contentBoxRect())); | 173 paintInvalidationRect = enclosingIntRect(mapRect(*rect, FloatRect(FloatP
oint(), m_imageResource->imageSize()), contentBoxRect())); |
| 174 // Guard against too-large changed rects. | 174 // Guard against too-large changed rects. |
| 175 paintInvalidationRect.intersect(contentBoxRect()); | 175 paintInvalidationRect.intersect(contentBoxRect()); |
| 176 } else { | 176 } else { |
| 177 paintInvalidationRect = contentBoxRect(); | 177 paintInvalidationRect = contentBoxRect(); |
| 178 } | 178 } |
| 179 | 179 |
| 180 { | 180 { |
| 181 // FIXME: We should not be allowing paint invalidations during layout. c
rbug.com/339584 | 181 // FIXME: We should not be allowing paint invalidations during layout. c
rbug.com/339584 |
| 182 AllowPaintInvalidationScope scoper(frameView()); | 182 AllowPaintInvalidationScope scoper(frameView()); |
| 183 DisableCompositingQueryAsserts disabler; | |
| 184 invalidatePaintRectangle(paintInvalidationRect); | 183 invalidatePaintRectangle(paintInvalidationRect); |
| 185 } | 184 } |
| 186 } | 185 } |
| 187 | 186 |
| 188 void RenderImage::notifyFinished(Resource* newImage) | 187 void RenderImage::notifyFinished(Resource* newImage) |
| 189 { | 188 { |
| 190 if (!m_imageResource) | 189 if (!m_imageResource) |
| 191 return; | 190 return; |
| 192 | 191 |
| 193 if (documentBeingDestroyed()) | 192 if (documentBeingDestroyed()) |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 return; | 341 return; |
| 343 } | 342 } |
| 344 } | 343 } |
| 345 | 344 |
| 346 bool RenderImage::needsPreferredWidthsRecalculation() const | 345 bool RenderImage::needsPreferredWidthsRecalculation() const |
| 347 { | 346 { |
| 348 return RenderReplaced::needsPreferredWidthsRecalculation(); | 347 return RenderReplaced::needsPreferredWidthsRecalculation(); |
| 349 } | 348 } |
| 350 | 349 |
| 351 } // namespace blink | 350 } // namespace blink |
| OLD | NEW |