Rename LayoutStyle to papayawhip

Source/core/css/resolver/MatchedPropertiesCache.cpp

Index: Source/core/css/resolver/MatchedPropertiesCache.cpp
diff --git a/Source/core/css/resolver/MatchedPropertiesCache.cpp b/Source/core/css/resolver/MatchedPropertiesCache.cpp
index b4aed522f13f3be600b00f1e50c993e8d2dc6d18..b78716787b72e0a5ae1740ff05bbc61c752fbd82 100644
--- a/Source/core/css/resolver/MatchedPropertiesCache.cpp
+++ b/Source/core/css/resolver/MatchedPropertiesCache.cpp
@@ -31,26 +31,26 @@
 
 #include "core/css/StylePropertySet.h"
 #include "core/css/resolver/StyleResolverState.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 
 namespace blink {
 
-void CachedMatchedProperties::set(const LayoutStyle& style, const LayoutStyle& parentStyle, const MatchResult& matchResult)
+void CachedMatchedProperties::set(const ComputedStyle& style, const ComputedStyle& parentStyle, const MatchResult& matchResult)
 {
     matchedProperties.appendVector(matchResult.matchedProperties);
     ranges = matchResult.ranges;
 
-    // Note that we don't cache the original LayoutStyle instance. It may be further modified.
-    // The LayoutStyle in the cache is really just a holder for the substructures and never used as-is.
-    this->layoutStyle = LayoutStyle::clone(style);
-    this->parentLayoutStyle = LayoutStyle::clone(parentStyle);
+    // Note that we don't cache the original ComputedStyle instance. It may be further modified.
+    // The ComputedStyle in the cache is really just a holder for the substructures and never used as-is.
+    this->computedStyle = ComputedStyle::clone(style);
+    this->parentComputedStyle = ComputedStyle::clone(parentStyle);
 }
 
 void CachedMatchedProperties::clear()
 {
     matchedProperties.clear();
-    layoutStyle = nullptr;
-    parentLayoutStyle = nullptr;
+    computedStyle = nullptr;
+    parentComputedStyle = nullptr;
 }
 
 MatchedPropertiesCache::MatchedPropertiesCache()
@@ -74,7 +74,7 @@ const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const
     size_t size = matchResult.matchedProperties.size();
     if (size != cacheItem->matchedProperties.size())
         return 0;
-    if (cacheItem->layoutStyle->insideLink() != styleResolverState.style()->insideLink())
+    if (cacheItem->computedStyle->insideLink() != styleResolverState.style()->insideLink())
         return 0;
     for (size_t i = 0; i < size; ++i) {
         if (matchResult.matchedProperties[i] != cacheItem->matchedProperties[i])
@@ -85,7 +85,7 @@ const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const
     return cacheItem;
 }
 
-void MatchedPropertiesCache::add(const LayoutStyle& style, const LayoutStyle& parentStyle, unsigned hash, const MatchResult& matchResult)
+void MatchedPropertiesCache::add(const ComputedStyle& style, const ComputedStyle& parentStyle, unsigned hash, const MatchResult& matchResult)
 {
 #if !ENABLE(OILPAN)
     static const unsigned maxAdditionsBetweenSweeps = 100;
@@ -118,7 +118,7 @@ void MatchedPropertiesCache::clearViewportDependent()
     Vector<unsigned, 16> toRemove;
     for (const auto& cacheEntry : m_cache) {
         CachedMatchedProperties* cacheItem = cacheEntry.value.get();
-        if (cacheItem->layoutStyle->hasViewportUnits())
+        if (cacheItem->computedStyle->hasViewportUnits())
             toRemove.append(cacheEntry.key);
     }
     m_cache.removeAll(toRemove);
@@ -146,15 +146,15 @@ void MatchedPropertiesCache::sweep(Timer<MatchedPropertiesCache>*)
 }
 #endif
 
-bool MatchedPropertiesCache::isCacheable(const Element* element, const LayoutStyle& style, const LayoutStyle& parentStyle)
+bool MatchedPropertiesCache::isCacheable(const Element* element, const ComputedStyle& style, const ComputedStyle& parentStyle)
 {
     if (style.unique() || (style.styleType() != NOPSEUDO && parentStyle.unique()))
         return false;
     if (style.hasAppearance())
         return false;
-    if (style.zoom() != LayoutStyle::initialZoom())
+    if (style.zoom() != ComputedStyle::initialZoom())
         return false;
-    if (style.writingMode() != LayoutStyle::initialWritingMode())
+    if (style.writingMode() != ComputedStyle::initialWritingMode())
         return false;
     // The cache assumes static knowledge about which properties are inherited.
     if (parentStyle.hasExplicitlyInheritedProperties())