| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 CSSVariableResolver(state).ResolveVariableReferences( | 122 CSSVariableResolver(state).ResolveVariableReferences( |
| 123 id, value, omit_animation_tainted); | 123 id, value, omit_animation_tainted); |
| 124 ApplyProperty(id, state, *resolved_value); | 124 ApplyProperty(id, state, *resolved_value); |
| 125 | 125 |
| 126 if (!state.Style()->HasVariableReferenceFromNonInheritedProperty() && | 126 if (!state.Style()->HasVariableReferenceFromNonInheritedProperty() && |
| 127 !CSSPropertyMetadata::IsInheritedProperty(id)) | 127 !CSSPropertyMetadata::IsInheritedProperty(id)) |
| 128 state.Style()->SetHasVariableReferenceFromNonInheritedProperty(); | 128 state.Style()->SetHasVariableReferenceFromNonInheritedProperty(); |
| 129 return; | 129 return; |
| 130 } | 130 } |
| 131 | 131 |
| 132 DCHECK(!isShorthandProperty(id)) << "Shorthand property id = " << id | 132 DCHECK(!isShorthandProperty(id)) |
| 133 << " wasn't expanded at parsing time"; | 133 << "Shorthand property id = " << id << " wasn't expanded at parsing time"; |
| 134 | 134 |
| 135 bool is_inherit = state.ParentNode() && value.IsInheritedValue(); | 135 bool is_inherit = state.ParentNode() && value.IsInheritedValue(); |
| 136 bool is_initial = value.IsInitialValue() || | 136 bool is_initial = value.IsInitialValue() || |
| 137 (!state.ParentNode() && value.IsInheritedValue()); | 137 (!state.ParentNode() && value.IsInheritedValue()); |
| 138 | 138 |
| 139 // isInherit => !isInitial && isInitial => !isInherit | 139 // isInherit => !isInitial && isInitial => !isInherit |
| 140 DCHECK(!is_inherit || !is_initial); | 140 DCHECK(!is_inherit || !is_initial); |
| 141 // isInherit => (state.parentNode() && state.parentStyle()) | 141 // isInherit => (state.parentNode() && state.parentStyle()) |
| 142 DCHECK(!is_inherit || (state.ParentNode() && state.ParentStyle())); | 142 DCHECK(!is_inherit || (state.ParentNode() && state.ParentStyle())); |
| 143 | 143 |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 state.Style()->SetCaretColor( | 987 state.Style()->SetCaretColor( |
| 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); | 988 StyleBuilderConverter::ConvertStyleAutoColor(state, value)); |
| 989 } | 989 } |
| 990 if (state.ApplyPropertyToVisitedLinkStyle()) { | 990 if (state.ApplyPropertyToVisitedLinkStyle()) { |
| 991 state.Style()->SetVisitedLinkCaretColor( | 991 state.Style()->SetVisitedLinkCaretColor( |
| 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); | 992 StyleBuilderConverter::ConvertStyleAutoColor(state, value, true)); |
| 993 } | 993 } |
| 994 } | 994 } |
| 995 | 995 |
| 996 } // namespace blink | 996 } // namespace blink |
| OLD | NEW |