Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

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

Issue 1704493002: Use Image::updateConcreteSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-image-updateconcretesize
Patch Set: Move test here from dependency CL. Created 4 years, 10 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
OLDNEW
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 26 matching lines...) Expand all
37 static PassRefPtrWillBeRawPtr<StyleGeneratedImage> create(const CSSImageGene ratorValue& value) 37 static PassRefPtrWillBeRawPtr<StyleGeneratedImage> create(const CSSImageGene ratorValue& value)
38 { 38 {
39 return adoptRefWillBeNoop(new StyleGeneratedImage(value)); 39 return adoptRefWillBeNoop(new StyleGeneratedImage(value));
40 } 40 }
41 41
42 WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); } 42 WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
43 43
44 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override; 44 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
45 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override; 45 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;
46 46
47 void updateConcreteObjectSize(const LayoutSize& defaultObjectSize) override;
47 LayoutSize imageSize(const LayoutObject*, float multiplier) const override; 48 LayoutSize imageSize(const LayoutObject*, float multiplier) const override;
48 bool imageHasRelativeSize() const override { return !m_fixedSize; } 49 bool imageHasRelativeSize() const override { return !m_fixedSize; }
49 void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSiz e, FloatSize& intrinsicRatio) override; 50 void computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSiz e, FloatSize& intrinsicRatio) override;
50 bool usesImageContainerSize() const override { return !m_fixedSize; } 51 bool usesImageContainerSize() const override { return !m_fixedSize; }
51 void addClient(LayoutObject*) override; 52 void addClient(LayoutObject*) override;
52 void removeClient(LayoutObject*) override; 53 void removeClient(LayoutObject*) override;
53 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const ov erride; 54 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const ov erride;
54 bool knownToBeOpaque(const LayoutObject*) const override; 55 bool knownToBeOpaque(const LayoutObject*) const override;
55 56
56 DECLARE_VIRTUAL_TRACE(); 57 DECLARE_VIRTUAL_TRACE();
57 58
58 private: 59 private:
59 StyleGeneratedImage(const CSSImageGeneratorValue&); 60 StyleGeneratedImage(const CSSImageGeneratorValue&);
60 61
61 // TODO(sashab): Replace this with <const CSSImageGeneratorValue> once RefPt rWillBeMember<> 62 // TODO(sashab): Replace this with <const CSSImageGeneratorValue> once RefPt rWillBeMember<>
62 // supports const types. 63 // supports const types.
63 RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue; 64 RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue;
64 const bool m_fixedSize; 65 const bool m_fixedSize;
66
67 // In case there's no fixed size, the default object size is used.
68 LayoutSize m_defaultObjectSize;
65 }; 69 };
66 70
67 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleGeneratedImage, isGeneratedImage()); 71 DEFINE_STYLE_IMAGE_TYPE_CASTS(StyleGeneratedImage, isGeneratedImage());
68 72
69 } // namespace blink 73 } // namespace blink
70 #endif 74 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698