Chromium Code Reviews| 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. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
| 4 * All rights reserved. | 4 * All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 175 } | 175 } |
| 176 | 176 |
| 177 void setZoom(float f) { | 177 void setZoom(float f) { |
| 178 if (m_style->setZoom(f)) | 178 if (m_style->setZoom(f)) |
| 179 m_fontBuilder.didChangeEffectiveZoom(); | 179 m_fontBuilder.didChangeEffectiveZoom(); |
| 180 } | 180 } |
| 181 void setEffectiveZoom(float f) { | 181 void setEffectiveZoom(float f) { |
| 182 if (m_style->setEffectiveZoom(f)) | 182 if (m_style->setEffectiveZoom(f)) |
| 183 m_fontBuilder.didChangeEffectiveZoom(); | 183 m_fontBuilder.didChangeEffectiveZoom(); |
| 184 } | 184 } |
| 185 void setWritingMode(WritingMode writingMode) { | 185 void setWritingMode(WritingMode newWritingMode) { |
| 186 if (m_style->setWritingMode(writingMode)) | 186 const WritingMode oldWritingMode = m_style->getWritingMode(); |
|
napper
2016/12/12 03:53:33
Not sure you need the temporary here.
sashab
2016/12/12 03:58:39
Sure, thought it helped with readability. Kept the
| |
| 187 m_fontBuilder.didChangeWritingMode(); | 187 if (oldWritingMode == newWritingMode) |
|
napper
2016/12/12 03:53:33
FWIW I have a style preference for either:
if (ol
sashab
2016/12/12 03:58:39
Ack, that's a really good point!! I actually thoug
| |
| 188 return; | |
| 189 m_style->setWritingMode(newWritingMode); | |
| 190 m_fontBuilder.didChangeWritingMode(); | |
| 188 } | 191 } |
| 189 void setTextOrientation(TextOrientation textOrientation) { | 192 void setTextOrientation(TextOrientation textOrientation) { |
| 190 if (m_style->setTextOrientation(textOrientation)) | 193 if (m_style->setTextOrientation(textOrientation)) |
| 191 m_fontBuilder.didChangeTextOrientation(); | 194 m_fontBuilder.didChangeTextOrientation(); |
| 192 } | 195 } |
| 193 | 196 |
| 194 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; } | 197 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; } |
| 195 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; } | 198 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; } |
| 196 | 199 |
| 197 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*); | 200 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 233 | 236 |
| 234 mutable HeapHashMap< | 237 mutable HeapHashMap< |
| 235 Member<const CSSPendingSubstitutionValue>, | 238 Member<const CSSPendingSubstitutionValue>, |
| 236 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>> | 239 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>> |
| 237 m_parsedPropertiesForPendingSubstitutionCache; | 240 m_parsedPropertiesForPendingSubstitutionCache; |
| 238 }; | 241 }; |
| 239 | 242 |
| 240 } // namespace blink | 243 } // namespace blink |
| 241 | 244 |
| 242 #endif // StyleResolverState_h | 245 #endif // StyleResolverState_h |
| OLD | NEW |