Move PropertyRegistry::Registration into PropertyRegistration

third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/resolver/CSSVariableResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/StyleBuilderFunctions.h"
 #include "core/StylePropertyShorthand.h"
@@ skipping 27 matching lines @@
 }
 
 CSSVariableData* CSSVariableResolver::valueForCustomProperty(
     AtomicString name) {
   if (m_variablesSeen.contains(name)) {
     m_cycleStartPoints.insert(name);
     return nullptr;
   }
 
   DCHECK(m_registry || !RuntimeEnabledFeatures::cssVariables2Enabled());
-  const PropertyRegistry::Registration* registration =
+  const PropertyRegistration* registration =
       m_registry ? m_registry->registration(name) : nullptr;
 
   CSSVariableData* variableData = nullptr;
   if (!registration || registration->inherits()) {
     if (m_inheritedVariables)
       variableData = m_inheritedVariables->getVariable(name);
   } else {
     if (m_nonInheritedVariables)
       variableData = m_nonInheritedVariables->getVariable(name);
   }
@@ skipping 272 matching lines @@
 CSSVariableResolver::CSSVariableResolver(const StyleResolverState& state)
     : m_inheritedVariables(state.style()->inheritedVariables()),
       m_nonInheritedVariables(state.style()->nonInheritedVariables()),
       m_registry(state.document().propertyRegistry()) {}
 
 DEFINE_TRACE(CSSVariableResolver) {
   visitor->trace(m_registry);
 }
 
 }  // namespace blink