| OLD | NEW |
| 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 Loading... |
| 110 return m_cachedUAStyle.get(); | 110 return m_cachedUAStyle.get(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 ElementStyleResources& elementStyleResources() { return m_elementStyleResour
ces; } | 113 ElementStyleResources& elementStyleResources() { return m_elementStyleResour
ces; } |
| 114 | 114 |
| 115 // FIXME: Once styleImage can be made to not take a StyleResolverState | 115 // FIXME: Once styleImage can be made to not take a StyleResolverState |
| 116 // this convenience function should be removed. As-is, without this, call | 116 // this convenience function should be removed. As-is, without this, call |
| 117 // sites are extremely verbose. | 117 // sites are extremely verbose. |
| 118 PassRefPtrWillBeRawPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSV
alue* value) | 118 PassRefPtrWillBeRawPtr<StyleImage> styleImage(CSSPropertyID propertyId, CSSV
alue* value) |
| 119 { | 119 { |
| 120 return m_elementStyleResources.styleImage(document(), document().textLin
kColors(), style()->color(), propertyId, value); | 120 return m_elementStyleResources.styleImage(document(), propertyId, value)
; |
| 121 } | 121 } |
| 122 | 122 |
| 123 FontBuilder& fontBuilder() { return m_fontBuilder; } | 123 FontBuilder& fontBuilder() { return m_fontBuilder; } |
| 124 // FIXME: These exist as a primitive way to track mutations to font-related
properties | 124 // FIXME: These exist as a primitive way to track mutations to font-related
properties |
| 125 // on a ComputedStyle. As designed, these are very error-prone, as some call
ers | 125 // on a ComputedStyle. As designed, these are very error-prone, as some call
ers |
| 126 // set these directly on the ComputedStyle w/o telling us. Presumably we'll | 126 // set these directly on the ComputedStyle w/o telling us. Presumably we'll |
| 127 // want to design a better wrapper around ComputedStyle for tracking these m
utations | 127 // want to design a better wrapper around ComputedStyle for tracking these m
utations |
| 128 // and separate it from StyleResolverState. | 128 // and separate it from StyleResolverState. |
| 129 const FontDescription& parentFontDescription() { return m_parentStyle->fontD
escription(); } | 129 const FontDescription& parentFontDescription() { return m_parentStyle->fontD
escription(); } |
| 130 | 130 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 FontBuilder m_fontBuilder; | 174 FontBuilder m_fontBuilder; |
| 175 | 175 |
| 176 OwnPtr<CachedUAStyle> m_cachedUAStyle; | 176 OwnPtr<CachedUAStyle> m_cachedUAStyle; |
| 177 | 177 |
| 178 ElementStyleResources m_elementStyleResources; | 178 ElementStyleResources m_elementStyleResources; |
| 179 }; | 179 }; |
| 180 | 180 |
| 181 } // namespace blink | 181 } // namespace blink |
| 182 | 182 |
| 183 #endif // StyleResolverState_h | 183 #endif // StyleResolverState_h |
| OLD | NEW |