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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 imageSize = imageSize.expandedTo(paddedTextSize); | 134 imageSize = imageSize.expandedTo(paddedTextSize); |
135 } | 135 } |
136 | 136 |
137 if (imageSize == intrinsicSize()) | 137 if (imageSize == intrinsicSize()) |
138 return false; | 138 return false; |
139 | 139 |
140 setIntrinsicSize(imageSize); | 140 setIntrinsicSize(imageSize); |
141 return true; | 141 return true; |
142 } | 142 } |
143 | 143 |
144 void RenderImage::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
le) | |
145 { | |
146 RenderReplaced::styleDidChange(diff, oldStyle); | |
147 } | |
148 | |
149 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect) | 144 void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect) |
150 { | 145 { |
151 if (documentBeingDestroyed()) | 146 if (documentBeingDestroyed()) |
152 return; | 147 return; |
153 | 148 |
154 if (hasBoxDecorations() || hasMask() || hasShapeOutside()) | 149 if (hasBoxDecorations() || hasMask() || hasShapeOutside()) |
155 RenderReplaced::imageChanged(newImage, rect); | 150 RenderReplaced::imageChanged(newImage, rect); |
156 | 151 |
157 if (!m_imageResource) | 152 if (!m_imageResource) |
158 return; | 153 return; |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
627 return 0; | 622 return 0; |
628 | 623 |
629 ImageResource* cachedImage = m_imageResource->cachedImage(); | 624 ImageResource* cachedImage = m_imageResource->cachedImage(); |
630 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 625 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) |
631 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 626 return toSVGImage(cachedImage->image())->embeddedContentBox(); |
632 | 627 |
633 return 0; | 628 return 0; |
634 } | 629 } |
635 | 630 |
636 } // namespace WebCore | 631 } // namespace WebCore |
OLD | NEW |