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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 // with empty rects. Use LayoutRect::contains in that case. | 584 // with empty rects. Use LayoutRect::contains in that case. |
585 bool isVisible; | 585 bool isVisible; |
586 if (!objectBounds.isEmpty()) | 586 if (!objectBounds.isEmpty()) |
587 isVisible = viewBounds.intersects(objectBounds); | 587 isVisible = viewBounds.intersects(objectBounds); |
588 else | 588 else |
589 isVisible = viewBounds.contains(objectBounds); | 589 isVisible = viewBounds.contains(objectBounds); |
590 | 590 |
591 ResourceLoadPriorityOptimizer::VisibilityStatus status = isVisible ? | 591 ResourceLoadPriorityOptimizer::VisibilityStatus status = isVisible ? |
592 ResourceLoadPriorityOptimizer::Visible : ResourceLoadPriorityOptimizer::
NotVisible; | 592 ResourceLoadPriorityOptimizer::Visible : ResourceLoadPriorityOptimizer::
NotVisible; |
593 | 593 |
594 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->notifyImageR
esourceVisibility(m_imageResource->cachedImage(), status); | 594 LayoutRect screenArea; |
| 595 if (!objectBounds.isEmpty()) { |
| 596 screenArea = viewBounds; |
| 597 screenArea.intersect(objectBounds); |
| 598 } |
| 599 |
| 600 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->notifyImageR
esourceVisibility(m_imageResource->cachedImage(), status, screenArea); |
595 | 601 |
596 return true; | 602 return true; |
597 } | 603 } |
598 | 604 |
599 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio, bool& isPercentageIntrinsicSize) const | 605 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, dou
ble& intrinsicRatio, bool& isPercentageIntrinsicSize) const |
600 { | 606 { |
601 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io, isPercentageIntrinsicSize); | 607 RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRat
io, isPercentageIntrinsicSize); |
602 | 608 |
603 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. | 609 // Our intrinsicSize is empty if we're rendering generated images with relat
ive width/height. Figure out the right intrinsic size to use. |
604 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { | 610 if (intrinsicSize.isEmpty() && (m_imageResource->imageHasRelativeWidth() ||
m_imageResource->imageHasRelativeHeight())) { |
(...skipping 25 matching lines...) Expand all Loading... |
630 return 0; | 636 return 0; |
631 | 637 |
632 ImageResource* cachedImage = m_imageResource->cachedImage(); | 638 ImageResource* cachedImage = m_imageResource->cachedImage(); |
633 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) | 639 if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage(
)) |
634 return toSVGImage(cachedImage->image())->embeddedContentBox(); | 640 return toSVGImage(cachedImage->image())->embeddedContentBox(); |
635 | 641 |
636 return 0; | 642 return 0; |
637 } | 643 } |
638 | 644 |
639 } // namespace WebCore | 645 } // namespace WebCore |
OLD | NEW |