third_party/WebKit/Source/core/style/StyleImage.h - Issue 1720853002: Remove Image::computeIntrinsicDimensions()

Side by Side Diff: third_party/WebKit/Source/core/style/StyleImage.h

Issue 1720853002: Remove Image::computeIntrinsicDimensions() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-and-use-updateconcretesize-upload

Patch Set: Avoid using the size of the error image. Null-check in ImageResource saved the day in previous patc… Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp ('k') | third_party/WebKit/Source/core/style/StyleInvalidImage.h » ('j') | third_party/WebKit/Source/platform/graphics/GeneratedImage.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Antti Koivisto (koivisto@kde.org)	3 * (C) 2000 Antti Koivisto (koivisto@kde.org)

4 * (C) 2000 Dirk Mueller (mueller@kde.org)	4 * (C) 2000 Dirk Mueller (mueller@kde.org)

5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

6 *	6 *

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

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

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 return data() == other.data();	51 return data() == other.data();

52 }	52 }

53	53

54 virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const = 0;	54 virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const = 0;

55 virtual PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const = 0;	55 virtual PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const = 0;

56	56

57 virtual bool canRender() const { return true; }	57 virtual bool canRender() const { return true; }

58 virtual bool isLoaded() const { return true; }	58 virtual bool isLoaded() const { return true; }

59 virtual bool errorOccurred() const { return false; }	59 virtual bool errorOccurred() const { return false; }

60 virtual LayoutSize imageSize(const LayoutObject*, float multiplier, const La youtSize& defaultObjectSize) const = 0;	60 virtual LayoutSize imageSize(const LayoutObject*, float multiplier, const La youtSize& defaultObjectSize) const = 0;

61 virtual void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intr insicSize, FloatSize& intrinsicRatio) = 0;

62 virtual bool imageHasRelativeSize() const = 0;	61 virtual bool imageHasRelativeSize() const = 0;

63 virtual bool usesImageContainerSize() const = 0;	62 virtual bool usesImageContainerSize() const = 0;

64 virtual void addClient(LayoutObject*) = 0;	63 virtual void addClient(LayoutObject*) = 0;

65 virtual void removeClient(LayoutObject*) = 0;	64 virtual void removeClient(LayoutObject*) = 0;

66 virtual PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const = 0;	65 virtual PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const = 0;

67 virtual WrappedImagePtr data() const = 0;	66 virtual WrappedImagePtr data() const = 0;

68 virtual float imageScaleFactor() const { return 1; }	67 virtual float imageScaleFactor() const { return 1; }

69 virtual bool knownToBeOpaque(const LayoutObject*) const = 0;	68 virtual bool knownToBeOpaque(const LayoutObject*) const = 0;

70 virtual ImageResource* cachedImage() const { return 0; }	69 virtual ImageResource* cachedImage() const { return 0; }

71	70

(...skipping 24 matching lines...) Expand all Loading...
96 LayoutSize imageSizeForSVGImage(SVGImage*, float multiplier, const LayoutSiz e& defaultObjectSize) const;	95 LayoutSize imageSizeForSVGImage(SVGImage*, float multiplier, const LayoutSiz e& defaultObjectSize) const;

97 };	96 };

98	97

99 #define DEFINE_STYLE_IMAGE_TYPE_CASTS(thisType, function) \	98 #define DEFINE_STYLE_IMAGE_TYPE_CASTS(thisType, function) \

100 DEFINE_TYPE_CASTS(thisType, StyleImage, styleImage, styleImage->function, st yleImage.function); \	99 DEFINE_TYPE_CASTS(thisType, StyleImage, styleImage, styleImage->function, st yleImage.function); \

101 inline thisType* to##thisType(const RefPtrWillBeMember<StyleImage>& styleIma ge) { return to##thisType(styleImage.get()); } \	100 inline thisType* to##thisType(const RefPtrWillBeMember<StyleImage>& styleIma ge) { return to##thisType(styleImage.get()); } \

102 typedef int NeedsSemiColonAfterDefineStyleImageTypeCasts	101 typedef int NeedsSemiColonAfterDefineStyleImageTypeCasts

103	102

104 } // namespace blink	103 } // namespace blink

105 #endif	104 #endif

OLD	NEW