| 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 // If the actual area occupied by the image has changed and it is not constr
ained by style then a layout is required. | 215 // If the actual area occupied by the image has changed and it is not constr
ained by style then a layout is required. |
| 216 bool imageSizeIsConstrained = style()->logicalWidth().isSpecified() && style
()->logicalHeight().isSpecified(); | 216 bool imageSizeIsConstrained = style()->logicalWidth().isSpecified() && style
()->logicalHeight().isSpecified(); |
| 217 bool needsLayout = !imageSizeIsConstrained && imageSourceHasChangedSize; | 217 bool needsLayout = !imageSizeIsConstrained && imageSourceHasChangedSize; |
| 218 | 218 |
| 219 // FIXME: We only need to recompute the containing block's preferred size if
the containing block's size | 219 // FIXME: We only need to recompute the containing block's preferred size if
the containing block's size |
| 220 // depends on the image's size (i.e., the container uses shrink-to-fit sizin
g). | 220 // depends on the image's size (i.e., the container uses shrink-to-fit sizin
g). |
| 221 // There's no easy way to detect that shrink-to-fit is needed, always force
a layout. | 221 // There's no easy way to detect that shrink-to-fit is needed, always force
a layout. |
| 222 bool containingBlockNeedsToRecomputePreferredSize = style()->logicalWidth()
.isPercent() || style()->logicalMaxWidth().isPercent() || style()->logicalMinWi
dth().isPercent(); | 222 bool containingBlockNeedsToRecomputePreferredSize = style()->logicalWidth()
.isPercent() || style()->logicalMaxWidth().isPercent() || style()->logicalMinWi
dth().isPercent(); |
| 223 | 223 |
| 224 if (needsLayout || containingBlockNeedsToRecomputePreferredSize) { | 224 if (needsLayout || containingBlockNeedsToRecomputePreferredSize) { |
| 225 setNeedsLayout(); | 225 setNeedsLayoutAndFullRepaint(); |
| 226 return; | 226 return; |
| 227 } | 227 } |
| 228 | 228 |
| 229 // The image hasn't changed in size or its style constrains its size, so a r
epaint will suffice. | 229 // The image hasn't changed in size or its style constrains its size, so a r
epaint will suffice. |
| 230 if (everHadLayout() && !selfNeedsLayout()) { | 230 if (everHadLayout() && !selfNeedsLayout()) { |
| 231 // The inner content rectangle is calculated during layout, but may need
an update now | 231 // The inner content rectangle is calculated during layout, but may need
an update now |
| 232 // (unless the box has already been scheduled for layout). In order to c
alculate it, we | 232 // (unless the box has already been scheduled for layout). In order to c
alculate it, we |
| 233 // may need values from the containing block, though, so make sure that
we're not too | 233 // may need values from the containing block, though, so make sure that
we're not too |
| 234 // early. It may be that layout hasn't even taken place once yet. | 234 // early. It may be that layout hasn't even taken place once yet. |
| 235 updateInnerContentRect(); | 235 updateInnerContentRect(); |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 623 return 0; | 623 return 0; |
| 624 | 624 |
| 625 ImageResource* cachedImage = m_imageResource->cachedImage(); | 625 ImageResource* cachedImage = m_imageResource->cachedImage(); |
| 626 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 626 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) |
| 627 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 627 return toSVGImage(cachedImage->image())->embeddedContentBox(); |
| 628 | 628 |
| 629 return 0; | 629 return 0; |
| 630 } | 630 } |
| 631 | 631 |
| 632 } // namespace WebCore | 632 } // namespace WebCore |
| OLD | NEW |