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