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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleFetchedImage.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/paint/SVGImagePainter.cpp ('k') | third_party/WebKit/Source/core/style/StyleFetchedImage.cpp » ('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 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
45 WrappedImagePtr data() const override;	45 WrappedImagePtr data() const override;

46	46

47 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;	47 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;

48 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;	48 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;

49	49

50 bool canRender() const override;	50 bool canRender() const override;

51 bool isLoaded() const override;	51 bool isLoaded() const override;

52 bool errorOccurred() const override;	52 bool errorOccurred() const override;

53 LayoutSize imageSize(const LayoutObject*, float multiplier, const LayoutSize & defaultObjectSize) const override;	53 LayoutSize imageSize(const LayoutObject*, float multiplier, const LayoutSize & defaultObjectSize) const override;

54 bool imageHasRelativeSize() const override;	54 bool imageHasRelativeSize() const override;

55 void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSiz e, FloatSize& intrinsicRatio) override;

56 bool usesImageContainerSize() const override;	55 bool usesImageContainerSize() const override;

57 void addClient(LayoutObject*) override;	56 void addClient(LayoutObject*) override;

58 void removeClient(LayoutObject*) override;	57 void removeClient(LayoutObject*) override;

59 void notifyFinished(Resource*) override;	58 void notifyFinished(Resource*) override;

60 String debugName() const override { return "StyleFetchedImage"; }	59 String debugName() const override { return "StyleFetchedImage"; }

61 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float zoom) con st override;	60 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float zoom) con st override;

62 bool knownToBeOpaque(const LayoutObject*) const override;	61 bool knownToBeOpaque(const LayoutObject*) const override;

63 ImageResource* cachedImage() const override;	62 ImageResource* cachedImage() const override;

64	63

65 DECLARE_VIRTUAL_TRACE();	64 DECLARE_VIRTUAL_TRACE();

66	65

67 private:	66 private:

68 StyleFetchedImage(ImageResource, Document, const KURL&);	67 StyleFetchedImage(ImageResource, Document, const KURL&);

69	68

70 void dispose();	69 void dispose();

71	70

72 RefPtrWillBeMember<ImageResource> m_image;	71 RefPtrWillBeMember<ImageResource> m_image;

73 RawPtrWillBeMember<Document> m_document;	72 RawPtrWillBeMember<Document> m_document;

74 const KURL m_url;	73 const KURL m_url;

75 };	74 };

76	75

77 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleFetchedImage, isImageResource());	76 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleFetchedImage, isImageResource());

78	77

79 } // namespace blink	78 } // namespace blink

80 #endif	79 #endif

OLD	NEW