Implement proposed shadow tree cascade order.

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 17 matching lines @@
 
 #include "config.h"
 #include "core/css/resolver/MatchedPropertiesCache.h"
 
 #include "core/css/StylePropertySet.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
-void CachedMatchedProperties::set(const ComputedStyle& style, const ComputedStyle& parentStyle, const MatchResult& matchResult)
+void CachedMatchedProperties::set(const ComputedStyle& style, const ComputedStyle& parentStyle, const MatchedPropertiesVector& properties)
 {
-    matchedProperties.appendVector(matchResult.matchedProperties);
+    matchedProperties.appendVector(properties);
 
     // 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();
     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)
+const CachedMatchedProperties* MatchedPropertiesCache::find(unsigned hash, const StyleResolverState& styleResolverState, const MatchedPropertiesVector& properties)
 {
     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();
+    size_t size = properties.size();
     if (size != cacheItem->matchedProperties.size())
         return 0;
     if (cacheItem->computedStyle->insideLink() != styleResolverState.style()->insideLink())
         return 0;
     for (size_t i = 0; i < size; ++i) {
-        if (matchResult.matchedProperties[i] != cacheItem->matchedProperties[i])
+        if (properties[i] != cacheItem->matchedProperties[i])
             return 0;
     }
     return cacheItem;
 }
 
-void MatchedPropertiesCache::add(const ComputedStyle& style, const ComputedStyle& parentStyle, unsigned hash, const MatchResult& matchResult)
+void MatchedPropertiesCache::add(const ComputedStyle& style, const ComputedStyle& parentStyle, unsigned hash, const MatchedPropertiesVector& properties)
 {
 #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
 
     ASSERT(hash);
     Cache::AddResult addResult = m_cache.add(hash, nullptr);
     if (addResult.isNewEntry)
         addResult.storedValue->value = adoptPtrWillBeNoop(new CachedMatchedProperties);
 
     CachedMatchedProperties* cacheItem = addResult.storedValue->value.get();
     if (!addResult.isNewEntry)
         cacheItem->clear();
 
-    cacheItem->set(style, parentStyle, matchResult);
+    cacheItem->set(style, parentStyle, properties);
 }
 
 void MatchedPropertiesCache::clear()
 {
     m_cache.clear();
 }
 
 void MatchedPropertiesCache::clearViewportDependent()
 {
     Vector<unsigned, 16> toRemove;
@@ skipping 44 matching lines @@
 }
 
 DEFINE_TRACE(MatchedPropertiesCache)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_cache);
 #endif
 }
 
 }