| 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 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 } | 947 } |
| 948 | 948 |
| 949 if (!registration) { | 949 if (!registration) { |
| 950 state.style()->setResolvedUnregisteredVariable(name, declaration.value()); | 950 state.style()->setResolvedUnregisteredVariable(name, declaration.value()); |
| 951 return; | 951 return; |
| 952 } | 952 } |
| 953 | 953 |
| 954 const CSSValue* parsedValue = | 954 const CSSValue* parsedValue = |
| 955 declaration.value()->parseForSyntax(registration->syntax()); | 955 declaration.value()->parseForSyntax(registration->syntax()); |
| 956 if (parsedValue) { | 956 if (parsedValue) { |
| 957 parsedValue = &StyleBuilderConverter::convertRegisteredPropertyValue( | |
| 958 state, *parsedValue); | |
| 959 DCHECK(parsedValue); | 957 DCHECK(parsedValue); |
| 960 if (isInheritedProperty) | 958 if (isInheritedProperty) |
| 961 state.style()->setResolvedInheritedVariable(name, declaration.value(), | 959 state.style()->setResolvedInheritedVariable(name, declaration.value(), |
| 962 parsedValue); | 960 parsedValue); |
| 963 else | 961 else |
| 964 state.style()->setResolvedNonInheritedVariable( | 962 state.style()->setResolvedNonInheritedVariable( |
| 965 name, declaration.value(), parsedValue); | 963 name, declaration.value(), parsedValue); |
| 966 return; | 964 return; |
| 967 } | 965 } |
| 968 if (isInheritedProperty) | 966 if (isInheritedProperty) |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1045 } | 1043 } |
| 1046 } | 1044 } |
| 1047 | 1045 |
| 1048 void StyleBuilderFunctions::applyInheritCSSPropertyPosition( | 1046 void StyleBuilderFunctions::applyInheritCSSPropertyPosition( |
| 1049 StyleResolverState& state) { | 1047 StyleResolverState& state) { |
| 1050 if (!state.parentNode()->isDocumentNode()) | 1048 if (!state.parentNode()->isDocumentNode()) |
| 1051 state.style()->setPosition(state.parentStyle()->position()); | 1049 state.style()->setPosition(state.parentStyle()->position()); |
| 1052 } | 1050 } |
| 1053 | 1051 |
| 1054 } // namespace blink | 1052 } // namespace blink |
| OLD | NEW |