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

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

Issue 1386413002: Added TODOs to StyleImage::create() to take PassRefPtrWillBeRawPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@make_styleresolverstate_styleImage_take_a_const_reference
Patch Set: Added comments to const_cast calls Created 5 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
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 16 matching lines...) Expand all
27 #include "core/CoreExport.h" 27 #include "core/CoreExport.h"
28 #include "core/style/StyleImage.h" 28 #include "core/style/StyleImage.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 class CSSValue; 32 class CSSValue;
33 class CSSImageGeneratorValue; 33 class CSSImageGeneratorValue;
34 34
35 class CORE_EXPORT StyleGeneratedImage final : public StyleImage { 35 class CORE_EXPORT StyleGeneratedImage final : public StyleImage {
36 public: 36 public:
37 static PassRefPtrWillBeRawPtr<StyleGeneratedImage> create(const CSSImageGene ratorValue& value) 37 // TODO(sashab): Make this take a PassRefPtrWillBeRawPtr<const CSSImageGener atorValue>.
38 static PassRefPtrWillBeRawPtr<StyleGeneratedImage> create(PassRefPtrWillBeRa wPtr<CSSImageGeneratorValue> value)
38 { 39 {
39 return adoptRefWillBeNoop(new StyleGeneratedImage(value)); 40 return adoptRefWillBeNoop(new StyleGeneratedImage(value));
40 } 41 }
41 42
42 WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); } 43 WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
43 44
44 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override; 45 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
45 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override; 46 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;
46 47
47 LayoutSize imageSize(const LayoutObject*, float multiplier) const override; 48 LayoutSize imageSize(const LayoutObject*, float multiplier) const override;
48 bool imageHasRelativeWidth() const override { return !m_fixedSize; } 49 bool imageHasRelativeWidth() const override { return !m_fixedSize; }
49 bool imageHasRelativeHeight() const override { return !m_fixedSize; } 50 bool imageHasRelativeHeight() const override { return !m_fixedSize; }
50 void computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override; 51 void computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
51 bool usesImageContainerSize() const override { return !m_fixedSize; } 52 bool usesImageContainerSize() const override { return !m_fixedSize; }
52 void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize& con tainerSize, float) override { m_containerSize = containerSize; } 53 void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize& con tainerSize, float) override { m_containerSize = containerSize; }
53 void addClient(LayoutObject*) override; 54 void addClient(LayoutObject*) override;
54 void removeClient(LayoutObject*) override; 55 void removeClient(LayoutObject*) override;
55 PassRefPtr<Image> image(const LayoutObject*, const IntSize&) const override; 56 PassRefPtr<Image> image(const LayoutObject*, const IntSize&) const override;
56 bool knownToBeOpaque(const LayoutObject*) const override; 57 bool knownToBeOpaque(const LayoutObject*) const override;
57 58
58 DECLARE_VIRTUAL_TRACE(); 59 DECLARE_VIRTUAL_TRACE();
59 60
60 private: 61 private:
61 StyleGeneratedImage(const CSSImageGeneratorValue&); 62 StyleGeneratedImage(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>);
62 63
63 // TODO(sashab): Replace this with <const CSSImageGeneratorValue> once RefPt rWillBeMember<> 64 // TODO(sashab): Replace this with <const CSSImageGeneratorValue> once RefPt rWillBeMember<>
64 // supports const types. 65 // supports const types.
65 RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue; 66 RefPtrWillBeMember<CSSImageGeneratorValue> m_imageGeneratorValue;
66 IntSize m_containerSize; 67 IntSize m_containerSize;
67 bool m_fixedSize; 68 bool m_fixedSize;
68 }; 69 };
69 70
70 } 71 }
71 #endif 72 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698