Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 2676993002: Move PropertyRegistry::Registration into PropertyRegistration (Closed)
Patch Set: Rebased Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 state.setTextOrientation( 877 state.setTextOrientation(
878 toCSSIdentifierValue(value).convertTo<TextOrientation>()); 878 toCSSIdentifierValue(value).convertTo<TextOrientation>());
879 } 879 }
880 880
881 void StyleBuilderFunctions::applyValueCSSPropertyVariable( 881 void StyleBuilderFunctions::applyValueCSSPropertyVariable(
882 StyleResolverState& state, 882 StyleResolverState& state,
883 const CSSValue& value) { 883 const CSSValue& value) {
884 const CSSCustomPropertyDeclaration& declaration = 884 const CSSCustomPropertyDeclaration& declaration =
885 toCSSCustomPropertyDeclaration(value); 885 toCSSCustomPropertyDeclaration(value);
886 const AtomicString& name = declaration.name(); 886 const AtomicString& name = declaration.name();
887 const PropertyRegistry::Registration* registration = nullptr; 887 const PropertyRegistration* registration = nullptr;
888 const PropertyRegistry* registry = state.document().propertyRegistry(); 888 const PropertyRegistry* registry = state.document().propertyRegistry();
889 if (registry) 889 if (registry)
890 registration = registry->registration(name); 890 registration = registry->registration(name);
891 891
892 bool isInheritedProperty = !registration || registration->inherits(); 892 bool isInheritedProperty = !registration || registration->inherits();
893 bool initial = declaration.isInitial(isInheritedProperty); 893 bool initial = declaration.isInitial(isInheritedProperty);
894 bool inherit = declaration.isInherit(isInheritedProperty); 894 bool inherit = declaration.isInherit(isInheritedProperty);
895 DCHECK(!(initial && inherit)); 895 DCHECK(!(initial && inherit));
896 896
897 if (!initial && !inherit) { 897 if (!initial && !inherit) {
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 state.style()->setCaretColor( 1029 state.style()->setCaretColor(
1030 StyleBuilderConverter::convertStyleAutoColor(state, value)); 1030 StyleBuilderConverter::convertStyleAutoColor(state, value));
1031 } 1031 }
1032 if (state.applyPropertyToVisitedLinkStyle()) { 1032 if (state.applyPropertyToVisitedLinkStyle()) {
1033 state.style()->setVisitedLinkCaretColor( 1033 state.style()->setVisitedLinkCaretColor(
1034 StyleBuilderConverter::convertStyleAutoColor(state, value, true)); 1034 StyleBuilderConverter::convertStyleAutoColor(state, value, true));
1035 } 1035 }
1036 } 1036 }
1037 1037
1038 } // namespace blink 1038 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698