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

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

Issue 1387113002: Change StyleResolverState.styleImage() to take a const CSSValue& (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODOs to replace the members with const members 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
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 23 matching lines...) Expand all
34 #include "platform/graphics/Image.h" 34 #include "platform/graphics/Image.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 // StylePendingImage is a placeholder StyleImage that is entered into the Comput edStyle during 38 // StylePendingImage is a placeholder StyleImage that is entered into the Comput edStyle during
39 // style resolution, in order to avoid loading images that are not referenced by the final style. 39 // style resolution, in order to avoid loading images that are not referenced by the final style.
40 // They should never exist in a ComputedStyle after it has been returned from th e style selector. 40 // They should never exist in a ComputedStyle after it has been returned from th e style selector.
41 41
42 class StylePendingImage final : public StyleImage { 42 class StylePendingImage final : public StyleImage {
43 public: 43 public:
44 static PassRefPtrWillBeRawPtr<StylePendingImage> create(CSSValue* value) 44 static PassRefPtrWillBeRawPtr<StylePendingImage> create(const CSSValue& valu e)
alancutter (OOO until 2018) 2015/10/07 03:28:28 I don't think we should break the pattern of creat
45 { 45 {
46 return adoptRefWillBeNoop(new StylePendingImage(value)); 46 return adoptRefWillBeNoop(new StylePendingImage(value));
47 } 47 }
48 48
49 WrappedImagePtr data() const override { return m_value.get(); } 49 WrappedImagePtr data() const override { return m_value.get(); }
50 50
51 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; } 51 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
52 52
53 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override 53 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override
54 { 54 {
(...skipping 21 matching lines...) Expand all
76 } 76 }
77 bool knownToBeOpaque(const LayoutObject*) const override { return false; } 77 bool knownToBeOpaque(const LayoutObject*) const override { return false; }
78 78
79 DEFINE_INLINE_VIRTUAL_TRACE() 79 DEFINE_INLINE_VIRTUAL_TRACE()
80 { 80 {
81 visitor->trace(m_value); 81 visitor->trace(m_value);
82 StyleImage::trace(visitor); 82 StyleImage::trace(visitor);
83 } 83 }
84 84
85 private: 85 private:
86 explicit StylePendingImage(CSSValue* value) 86 explicit StylePendingImage(const CSSValue& value)
87 : m_value(value) 87 : m_value(const_cast<CSSValue*>(&value))
88 { 88 {
89 m_isPendingImage = true; 89 m_isPendingImage = true;
90 } 90 }
91 91
92 // TODO(sashab): Replace this with <const CSSValue> once RefPtrWillBeMember< >
93 // supports const types.
92 RefPtrWillBeMember<CSSValue> m_value; 94 RefPtrWillBeMember<CSSValue> m_value;
93 }; 95 };
94 96
95 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage()); 97 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage());
96 98
97 } 99 }
98 #endif 100 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleGeneratedImage.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698