Source/core/rendering/RenderImageResource.h - Issue 25105004: Use srcset's resource pixel density to determine intrinsic size

Side by Side Diff: Source/core/rendering/RenderImageResource.h

Issue 25105004: Use srcset's resource pixel density to determine intrinsic size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cleantests

Patch Set: Fixed expected test results Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« Source/core/rendering/RenderImage.cpp ('K') | « Source/core/rendering/RenderImage.cpp ('k') | Source/core/rendering/RenderImageResource.cpp » ('j') | Source/core/rendering/RenderImageResource.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>	2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>

3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>	3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>

4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>	4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>

5 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>	5 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>

6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.

7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>	7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>

8 *	8 *

9 * This library is free software; you can redistribute it and/or	9 * This library is free software; you can redistribute it and/or

10 * modify it under the terms of the GNU Library General Public	10 * modify it under the terms of the GNU Library General Public

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 void resetAnimation();	56 void resetAnimation();

57	57

58 virtual PassRefPtr<Image> image(int /* width / = 0, int / height */ = 0) c onst { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : null Image(); }	58 virtual PassRefPtr<Image> image(int /* width / = 0, int / height */ = 0) c onst { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : null Image(); }

59 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); }	59 virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage-> errorOccurred(); }

60	60

61 virtual void setContainerSizeForRenderer(const IntSize&);	61 virtual void setContainerSizeForRenderer(const IntSize&);

62 virtual bool usesImageContainerSize() const { return m_cachedImage ? m_cache dImage->usesImageContainerSize() : false; }	62 virtual bool usesImageContainerSize() const { return m_cachedImage ? m_cache dImage->usesImageContainerSize() : false; }

63 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; }	63 virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cached Image->imageHasRelativeWidth() : false; }

64 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; }	64 virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cache dImage->imageHasRelativeHeight() : false; }

65	65

66 virtual LayoutSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize(); }	66 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); }

67 virtual LayoutSize intrinsicSize(float multiplier) const { return m_cachedIm age ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier, ImageResource: :IntrinsicSize) : LayoutSize(); }	67 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); }

68	68

69 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }	69 virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }

70	70

71 protected:	71 protected:

72 RenderImageResource();	72 RenderImageResource();

73 RenderObject* m_renderer;	73 RenderObject* m_renderer;

74 ResourcePtr<ImageResource> m_cachedImage;	74 ResourcePtr<ImageResource> m_cachedImage;

75	75

76 private:	76 private:

77 static Image* nullImage();	77 static Image* nullImage();

	78 LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const;

78 };	79 };

79	80

80 } // namespace WebCore	81 } // namespace WebCore

81	82

82 #endif // RenderImage_h	83 #endif // RenderImage_h

OLD	NEW