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

Side by Side Diff: Source/core/css/resolver/StyleResolverState.h

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 const CachedUAStyle* cachedUAStyle() const 110 const CachedUAStyle* cachedUAStyle() const
111 { 111 {
112 return m_cachedUAStyle.get(); 112 return m_cachedUAStyle.get();
113 } 113 }
114 114
115 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; } 115 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; }
116 116
117 // FIXME: Once styleImage can be made to not take a StyleResolverState 117 // FIXME: Once styleImage can be made to not take a StyleResolverState
118 // this convenience function should be removed. As-is, without this, call 118 // this convenience function should be removed. As-is, without this, call
119 // sites are extremely verbose. 119 // sites are extremely verbose.
120 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value) 120 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue value)
121 { 121 {
122 return m_elementStyleResources.styleImage(document(), document().textLin kColors(), style()->color(), propertyId, value); 122 return m_elementStyleResources.styleImage(document(), document().textLin kColors(), style()->color(), propertyId, value);
123 } 123 }
124 124
125 FontBuilder& fontBuilder() { return m_fontBuilder; } 125 FontBuilder& fontBuilder() { return m_fontBuilder; }
126 // FIXME: These exist as a primitive way to track mutations to font-related properties 126 // FIXME: These exist as a primitive way to track mutations to font-related properties
127 // on a ComputedStyle. As designed, these are very error-prone, as some call ers 127 // on a ComputedStyle. As designed, these are very error-prone, as some call ers
128 // set these directly on the ComputedStyle w/o telling us. Presumably we'll 128 // set these directly on the ComputedStyle w/o telling us. Presumably we'll
129 // want to design a better wrapper around ComputedStyle for tracking these m utations 129 // want to design a better wrapper around ComputedStyle for tracking these m utations
130 // and separate it from StyleResolverState. 130 // and separate it from StyleResolverState.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 FontBuilder m_fontBuilder; 176 FontBuilder m_fontBuilder;
177 177
178 OwnPtr<CachedUAStyle> m_cachedUAStyle; 178 OwnPtr<CachedUAStyle> m_cachedUAStyle;
179 179
180 ElementStyleResources m_elementStyleResources; 180 ElementStyleResources m_elementStyleResources;
181 }; 181 };
182 182
183 } // namespace blink 183 } // namespace blink
184 184
185 #endif // StyleResolverState_h 185 #endif // StyleResolverState_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/css/resolver/TransformBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698