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

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

Issue 20061003: Move isValid/isCurrentColor from Color to StyleColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; } 116 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; }
117 const CSSToStyleMap& styleMap() const { return m_styleMap; } 117 const CSSToStyleMap& styleMap() const { return m_styleMap; }
118 CSSToStyleMap& styleMap() { return m_styleMap; } 118 CSSToStyleMap& styleMap() { return m_styleMap; }
119 119
120 // FIXME: Once styleImage can be made to not take a StyleResolverState 120 // FIXME: Once styleImage can be made to not take a StyleResolverState
121 // this convenience function should be removed. As-is, without this, call 121 // this convenience function should be removed. As-is, without this, call
122 // sites are extremely verbose. 122 // sites are extremely verbose.
123 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value) 123 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value)
124 { 124 {
125 return m_elementStyleResources.styleImage(document()->textLinkColors(), style()->visitedDependentColor(CSSPropertyColor), propertyId, value); 125 return m_elementStyleResources.styleImage(document()->textLinkColors(), propertyId, value);
126 } 126 }
127 127
128 FontBuilder& fontBuilder() { return m_fontBuilder; } 128 FontBuilder& fontBuilder() { return m_fontBuilder; }
129 // FIXME: These exist as a primitive way to track mutations to font-related properties 129 // FIXME: These exist as a primitive way to track mutations to font-related properties
130 // on a RenderStyle. As designed, these are very error-prone, as some caller s 130 // on a RenderStyle. As designed, these are very error-prone, as some caller s
131 // set these directly on the RenderStyle w/o telling us. Presumably we'll 131 // set these directly on the RenderStyle w/o telling us. Presumably we'll
132 // want to design a better wrapper around RenderStyle for tracking these mut ations 132 // want to design a better wrapper around RenderStyle for tracking these mut ations
133 // and separate it from StyleResolverState. 133 // and separate it from StyleResolverState.
134 const FontDescription& parentFontDescription() { return m_parentStyle->fontD escription(); } 134 const FontDescription& parentFontDescription() { return m_parentStyle->fontD escription(); }
135 void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZo om(f)); } 135 void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZo om(f)); }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 ElementStyleResources m_elementStyleResources; 178 ElementStyleResources m_elementStyleResources;
179 // CSSToStyleMap is a pure-logic class and only contains 179 // CSSToStyleMap is a pure-logic class and only contains
180 // a back-pointer to this object. 180 // a back-pointer to this object.
181 CSSToStyleMap m_styleMap; 181 CSSToStyleMap m_styleMap;
182 }; 182 };
183 183
184 } // namespace WebCore 184 } // namespace WebCore
185 185
186 #endif // StyleResolverState_h 186 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698