| 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. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. |
| 7 * All rights reserved. | 7 * All rights reserved. |
| 8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 8 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 9 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 10 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| (...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 920 else | 920 else |
| 921 state.style()->setResolvedNonInheritedVariable( | 921 state.style()->setResolvedNonInheritedVariable( |
| 922 name, declaration.value(), parsedValue); | 922 name, declaration.value(), parsedValue); |
| 923 return; | 923 return; |
| 924 } | 924 } |
| 925 if (isInheritedProperty) | 925 if (isInheritedProperty) |
| 926 inherit = true; | 926 inherit = true; |
| 927 else | 927 else |
| 928 initial = true; | 928 initial = true; |
| 929 } | 929 } |
| 930 DCHECK(initial ^ inherit); |
| 930 | 931 |
| 931 state.style()->removeVariable(name, isInheritedProperty); | 932 state.style()->removeVariable(name, isInheritedProperty); |
| 932 if (initial) { | 933 if (initial) { |
| 933 return; | 934 return; |
| 934 } | 935 } |
| 935 | 936 |
| 936 DCHECK(inherit); | 937 DCHECK(inherit); |
| 937 CSSVariableData* parentValue = | 938 CSSVariableData* parentValue = |
| 938 state.parentStyle()->getVariable(name, isInheritedProperty); | 939 state.parentStyle()->getVariable(name, isInheritedProperty); |
| 939 const CSSValue* parentCSSValue = | 940 const CSSValue* parentCSSValue = |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1028 state.style()->setCaretColor( | 1029 state.style()->setCaretColor( |
| 1029 StyleBuilderConverter::convertStyleAutoColor(state, value)); | 1030 StyleBuilderConverter::convertStyleAutoColor(state, value)); |
| 1030 } | 1031 } |
| 1031 if (state.applyPropertyToVisitedLinkStyle()) { | 1032 if (state.applyPropertyToVisitedLinkStyle()) { |
| 1032 state.style()->setVisitedLinkCaretColor( | 1033 state.style()->setVisitedLinkCaretColor( |
| 1033 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); | 1034 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); |
| 1034 } | 1035 } |
| 1035 } | 1036 } |
| 1036 | 1037 |
| 1037 } // namespace blink | 1038 } // namespace blink |
| OLD | NEW |