| 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 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 return; | 572 return; |
| 573 | 573 |
| 574 if (node()->hasTagName(inputTag)) | 574 if (node()->hasTagName(inputTag)) |
| 575 m_altText = toHTMLInputElement(node())->altText(); | 575 m_altText = toHTMLInputElement(node())->altText(); |
| 576 else if (node()->hasTagName(imgTag)) | 576 else if (node()->hasTagName(imgTag)) |
| 577 m_altText = toHTMLImageElement(node())->altText(); | 577 m_altText = toHTMLImageElement(node())->altText(); |
| 578 } | 578 } |
| 579 | 579 |
| 580 void RenderImage::layout() | 580 void RenderImage::layout() |
| 581 { | 581 { |
| 582 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 583 RenderReplaced::layout(); | 582 RenderReplaced::layout(); |
| 584 updateInnerContentRect(); | 583 updateInnerContentRect(); |
| 585 } | 584 } |
| 586 | 585 |
| 587 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio, bool& isPercentageIntrinsicSize) const | 586 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio, bool& isPercentageIntrinsicSize) const |
| 588 { | 587 { |
| 589 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io, isPercentageIntrinsicSize); | 588 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io, isPercentageIntrinsicSize); |
| 590 | 589 |
| 591 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. | 590 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. |
| 592 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { | 591 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 617 return 0; | 616 return 0; |
| 618 | 617 |
| 619 ImageResource* cachedImage = m_imageResource->cachedImage(); | 618 ImageResource* cachedImage = m_imageResource->cachedImage(); |
| 620 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 619 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) |
| 621 return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox(
); | 620 return static_cast<SVGImage*>(cachedImage->image())->embeddedContentBox(
); |
| 622 | 621 |
| 623 return 0; | 622 return 0; |
| 624 } | 623 } |
| 625 | 624 |
| 626 } // namespace WebCore | 625 } // namespace WebCore |
| OLD | NEW |