Rename LayoutStyle to papayawhip

Source/core/css/resolver/MatchedPropertiesCache.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 13 matching lines @@
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/resolver/MatchedPropertiesCache.h"
 
 #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()
 #if !ENABLE(OILPAN)
     : m_additionsSinceLastSweep(0)
     , m_sweepTimer(this, &MatchedPropertiesCache::sweep)
 #endif
 {
 }
 
 const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const StyleResolverState& styleResolverState, const MatchResult& matchResult)
 {
     ASSERT(hash);
 
     Cache::iterator it = m_cache.find(hash);
     if (it == m_cache.end())
         return 0;
     CachedMatchedProperties* cacheItem = it->value.get();
     ASSERT(cacheItem);
 
     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])
             return 0;
     }
     if (cacheItem->ranges != matchResult.ranges)
         return 0;
     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;
     if (++m_additionsSinceLastSweep >= maxAdditionsBetweenSweeps
         && !m_sweepTimer.isActive()) {
         static const unsigned sweepTimeInSeconds = 60;
         m_sweepTimer.startOneShot(sweepTimeInSeconds, FROM_HERE);
     }
 #endif
 
@@ skipping 12 matching lines @@
 void MatchedPropertiesCache::clear()
 {
     m_cache.clear();
 }
 
 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);
 }
 
 #if !ENABLE(OILPAN)
 void MatchedPropertiesCache::sweep(Timer<MatchedPropertiesCache>*)
 {
     // Look for cache entries containing a style declaration with a single ref and remove them.
     // This may happen when an element attribute mutation causes it to generate a new inlineStyle()
     // or presentationAttributeStyle(), potentially leaving this cache with the last ref on the old one.
     Vector<unsigned, 16> toRemove;
     for (const auto& cacheEntry : m_cache) {
         CachedMatchedProperties* cacheItem = cacheEntry.value.get();
         Vector<MatchedProperties>& matchedProperties = cacheItem->matchedProperties;
         for (size_t i = 0; i < matchedProperties.size(); ++i) {
             if (matchedProperties[i].properties->hasOneRef()) {
                 toRemove.append(cacheEntry.key);
                 break;
             }
         }
     }
     m_cache.removeAll(toRemove);
     m_additionsSinceLastSweep = 0;
 }
 #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())
         return false;
     return true;
 }
 
 DEFINE_TRACE(MatchedPropertiesCache)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_cache);
 #endif
 }
 
 }