| 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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 if (inside) | 292 if (inside) |
| 293 result = tempResult; | 293 result = tempResult; |
| 294 return inside; | 294 return inside; |
| 295 } | 295 } |
| 296 | 296 |
| 297 void RenderImage::layout() | 297 void RenderImage::layout() |
| 298 { | 298 { |
| 299 LayoutRect oldContentRect = replacedContentRect(); | 299 LayoutRect oldContentRect = replacedContentRect(); |
| 300 RenderReplaced::layout(); | 300 RenderReplaced::layout(); |
| 301 if (replacedContentRect() != oldContentRect) { | 301 if (replacedContentRect() != oldContentRect) { |
| 302 setShouldDoFullPaintInvalidation(true); | |
| 303 updateInnerContentRect(); | 302 updateInnerContentRect(); |
| 304 } | 303 } |
| 305 } | 304 } |
| 306 | 305 |
| 307 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio) const | 306 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio) const |
| 308 { | 307 { |
| 309 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io); | 308 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io); |
| 310 | 309 |
| 311 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. | 310 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. |
| 312 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { | 311 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 324 return; | 323 return; |
| 325 } | 324 } |
| 326 } | 325 } |
| 327 | 326 |
| 328 bool RenderImage::needsPreferredWidthsRecalculation() const | 327 bool RenderImage::needsPreferredWidthsRecalculation() const |
| 329 { | 328 { |
| 330 return RenderReplaced::needsPreferredWidthsRecalculation(); | 329 return RenderReplaced::needsPreferredWidthsRecalculation(); |
| 331 } | 330 } |
| 332 | 331 |
| 333 } // namespace blink | 332 } // namespace blink |
| OLD | NEW |