third_party/WebKit/Source/core/layout/LayoutImageResource.h - Issue 1431973002: Revert of Make LayoutImageResource::image() parameter explicit

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutImageResource.h

Issue 1431973002: Revert of Make LayoutImageResource::image() parameter explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

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 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 }	46 }

47	47

48 virtual void initialize(LayoutObject*);	48 virtual void initialize(LayoutObject*);

49 virtual void shutdown();	49 virtual void shutdown();

50	50

51 void setImageResource(ImageResource*);	51 void setImageResource(ImageResource*);

52 ImageResource* cachedImage() const { return m_cachedImage.get(); }	52 ImageResource* cachedImage() const { return m_cachedImage.get(); }

53 virtual bool hasImage() const { return m_cachedImage; }	53 virtual bool hasImage() const { return m_cachedImage; }

54	54

55 void resetAnimation();	55 void resetAnimation();

56 bool maybeAnimated() const;

57	56

58 virtual PassRefPtr<Image> image(const IntSize&) const	57 virtual PassRefPtr<Image> image(int /* width / = 0, int / height */ = 0) c onst

59 {	58 {

60 return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObjec t) : Image::nullImage();	59 return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObjec t) : Image::nullImage();

61 }	60 }

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

63	62

64 virtual void setContainerSizeForLayoutObject(const IntSize&);	63 virtual void setContainerSizeForLayoutObject(const IntSize&);

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

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

67	66

68 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); }	67 virtual LayoutSize imageSize(float multiplier) const { return getImageSize(m ultiplier, ImageResource::NormalSize); }

69 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); }	68 virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSi ze(multiplier, ImageResource::IntrinsicSize); }

70	69

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

72	71

73 DEFINE_INLINE_VIRTUAL_TRACE() { }	72 DEFINE_INLINE_VIRTUAL_TRACE() { }

74	73

75 protected:	74 protected:

76 LayoutImageResource();	75 LayoutImageResource();

77 LayoutObject* m_layoutObject;	76 LayoutObject* m_layoutObject;

78 ResourcePtr<ImageResource> m_cachedImage;	77 ResourcePtr<ImageResource> m_cachedImage;

79	78

80 private:	79 private:

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

82 };	81 };

83	82

84 } // namespace blink	83 } // namespace blink

85	84

86 #endif // LayoutImage_h	85 #endif // LayoutImage_h

OLD	NEW