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

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

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; } 95 ElementStyleResources& elementStyleResources() { return m_elementStyleResour ces; }
96 const CSSToStyleMap& styleMap() const { return m_styleMap; } 96 const CSSToStyleMap& styleMap() const { return m_styleMap; }
97 CSSToStyleMap& styleMap() { return m_styleMap; } 97 CSSToStyleMap& styleMap() { return m_styleMap; }
98 98
99 // FIXME: Once styleImage can be made to not take a StyleResolverState 99 // FIXME: Once styleImage can be made to not take a StyleResolverState
100 // this convenience function should be removed. As-is, without this, call 100 // this convenience function should be removed. As-is, without this, call
101 // sites are extremely verbose. 101 // sites are extremely verbose.
102 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value) 102 PassRefPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSValue* value)
103 { 103 {
104 return m_elementStyleResources.styleImage(document().textLinkColors(), p ropertyId, value); 104 return m_elementStyleResources.styleImage(document().textLinkColors(), s tyle()->visitedDependentColor(CSSPropertyColor), propertyId, value);
105 } 105 }
106 106
107 FontBuilder& fontBuilder() { return m_fontBuilder; } 107 FontBuilder& fontBuilder() { return m_fontBuilder; }
108 // FIXME: These exist as a primitive way to track mutations to font-related properties 108 // FIXME: These exist as a primitive way to track mutations to font-related properties
109 // on a RenderStyle. As designed, these are very error-prone, as some caller s 109 // on a RenderStyle. As designed, these are very error-prone, as some caller s
110 // set these directly on the RenderStyle w/o telling us. Presumably we'll 110 // set these directly on the RenderStyle w/o telling us. Presumably we'll
111 // want to design a better wrapper around RenderStyle for tracking these mut ations 111 // want to design a better wrapper around RenderStyle for tracking these mut ations
112 // and separate it from StyleResolverState. 112 // and separate it from StyleResolverState.
113 const FontDescription& parentFontDescription() { return m_parentStyle->fontD escription(); } 113 const FontDescription& parentFontDescription() { return m_parentStyle->fontD escription(); }
114 void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZo om(f)); } 114 void setZoom(float f) { m_fontBuilder.didChangeFontParameters(m_style->setZo om(f)); }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 ElementStyleResources m_elementStyleResources; 160 ElementStyleResources m_elementStyleResources;
161 // CSSToStyleMap is a pure-logic class and only contains 161 // CSSToStyleMap is a pure-logic class and only contains
162 // a back-pointer to this object. 162 // a back-pointer to this object.
163 CSSToStyleMap m_styleMap; 163 CSSToStyleMap m_styleMap;
164 Vector<AtomicString> m_contentAttrValues; 164 Vector<AtomicString> m_contentAttrValues;
165 }; 165 };
166 166
167 } // namespace WebCore 167 } // namespace WebCore
168 168
169 #endif // StyleResolverState_h 169 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698