| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 state.fontBuilder().setFontSizeInitial(); | 179 state.fontBuilder().setFontSizeInitial(); |
| 180 } | 180 } |
| 181 | 181 |
| 182 void StyleBuilderFunctions::applyInheritCSSPropertyFontSize(StyleResolverState&
state) | 182 void StyleBuilderFunctions::applyInheritCSSPropertyFontSize(StyleResolverState&
state) |
| 183 { | 183 { |
| 184 state.fontBuilder().setFontSizeInherit(state.parentFontDescription()); | 184 state.fontBuilder().setFontSizeInherit(state.parentFontDescription()); |
| 185 } | 185 } |
| 186 | 186 |
| 187 void StyleBuilderFunctions::applyValueCSSPropertyFontSize(StyleResolverState& st
ate, CSSValue* value) | 187 void StyleBuilderFunctions::applyValueCSSPropertyFontSize(StyleResolverState& st
ate, CSSValue* value) |
| 188 { | 188 { |
| 189 state.fontBuilder().setFontSizeValue(value, state.parentStyle(), state.rootE
lementStyle()); | 189 state.fontBuilder().setFontSizeValue(value, state.parentStyle()); |
| 190 } | 190 } |
| 191 | 191 |
| 192 void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState&
state, CSSValue* value) | 192 void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState&
state, CSSValue* value) |
| 193 { | 193 { |
| 194 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 194 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
| 195 Length lineHeight; | 195 Length lineHeight; |
| 196 | 196 |
| 197 if (primitiveValue->getValueID() == CSSValueNormal) { | 197 if (primitiveValue->getValueID() == CSSValueNormal) { |
| 198 lineHeight = RenderStyle::initialLineHeight(); | 198 lineHeight = RenderStyle::initialLineHeight(); |
| 199 } else if (primitiveValue->isLength()) { | 199 } else if (primitiveValue->isLength()) { |
| (...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 state.style()->setPerspective(perspectiveValue); | 832 state.style()->setPerspective(perspectiveValue); |
| 833 } | 833 } |
| 834 | 834 |
| 835 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso
lverState& state, CSSValue* value) | 835 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso
lverState& state, CSSValue* value) |
| 836 { | 836 { |
| 837 if (value->isPrimitiveValue()) | 837 if (value->isPrimitiveValue()) |
| 838 state.setTextOrientation(*toCSSPrimitiveValue(value)); | 838 state.setTextOrientation(*toCSSPrimitiveValue(value)); |
| 839 } | 839 } |
| 840 | 840 |
| 841 } // namespace blink | 841 } // namespace blink |
| OLD | NEW |