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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 default: 1938 default:
1939 return genericBreakValue; 1939 return genericBreakValue;
1940 } 1940 }
1941 } 1941 }
1942 1942
1943 const CSSValue* ComputedStyleCSSValueMapping::get( 1943 const CSSValue* ComputedStyleCSSValueMapping::get(
1944 const AtomicString customPropertyName, 1944 const AtomicString customPropertyName,
1945 const ComputedStyle& style, 1945 const ComputedStyle& style,
1946 const PropertyRegistry* registry) { 1946 const PropertyRegistry* registry) {
1947 if (registry) { 1947 if (registry) {
1948 const PropertyRegistry::Registration* registration = 1948 const PropertyRegistration* registration =
1949 registry->registration(customPropertyName); 1949 registry->registration(customPropertyName);
1950 if (registration) { 1950 if (registration) {
1951 const CSSValue* result = style.getRegisteredVariable( 1951 const CSSValue* result = style.getRegisteredVariable(
1952 customPropertyName, registration->inherits()); 1952 customPropertyName, registration->inherits());
1953 if (result) 1953 if (result)
1954 return result; 1954 return result;
1955 return registration->initial(); 1955 return registration->initial();
1956 } 1956 }
1957 } 1957 }
1958 1958
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
3641 case CSSPropertyAll: 3641 case CSSPropertyAll:
3642 return nullptr; 3642 return nullptr;
3643 default: 3643 default:
3644 break; 3644 break;
3645 } 3645 }
3646 ASSERT_NOT_REACHED(); 3646 ASSERT_NOT_REACHED();
3647 return nullptr; 3647 return nullptr;
3648 } 3648 }
3649 3649
3650 } // namespace blink 3650 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698