Oilpan: tidy StylePropertySerializer's handling of GCed objects.

Source/core/css/StylePropertySerializer.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 22 matching lines @@
 namespace blink {
 
 static bool isInitialOrInherit(const String& value)
 {
     DEFINE_STATIC_LOCAL(String, initial, ("initial"));
     DEFINE_STATIC_LOCAL(String, inherit, ("inherit"));
     return value.length() == 7 && (value == initial || value == inherit);
 }
 
 StylePropertySerializer::StylePropertySetForSerializer::StylePropertySetForSerializer(const StylePropertySet& properties)
-    : m_propertySet(properties)
-    , m_allIndex(m_propertySet.findPropertyIndex(CSSPropertyAll))
+    : m_propertySet(&properties)
+    , m_allIndex(m_propertySet->findPropertyIndex(CSSPropertyAll))
     , m_needToExpandAll(false)
 {
     if (!hasAllProperty())
         return;
 
-    StylePropertySet::PropertyReference allProperty = m_propertySet.propertyAt(m_allIndex);
-    for (unsigned i = 0; i < m_propertySet.propertyCount(); ++i) {
-        StylePropertySet::PropertyReference property = m_propertySet.propertyAt(i);
+    StylePropertySet::PropertyReference allProperty = m_propertySet->propertyAt(m_allIndex);
+    for (unsigned i = 0; i < m_propertySet->propertyCount(); ++i) {
+        StylePropertySet::PropertyReference property = m_propertySet->propertyAt(i);
         if (CSSProperty::isAffectedByAllProperty(property.id())) {
             if (allProperty.isImportant() && !property.isImportant())
                 continue;
             if (static_cast<unsigned>(m_allIndex) >= i)
                 continue;
             if (property.value()->equals(*allProperty.value())
                 && property.isImportant() == allProperty.isImportant())
                 continue;
             m_needToExpandAll = true;
         }
         m_longhandPropertyUsed.set(property.id() - firstCSSProperty);
     }
 }
 
+DEFINE_TRACE(StylePropertySerializer::StylePropertySetForSerializer)
+{
+    visitor->trace(m_propertySet);
+}
+
 unsigned StylePropertySerializer::StylePropertySetForSerializer::propertyCount() const
 {
     if (!hasExpandedAllProperty())
-        return m_propertySet.propertyCount();
+        return m_propertySet->propertyCount();
     return lastCSSProperty - firstCSSProperty + 1;
 }
 
 StylePropertySerializer::PropertyValueForSerializer StylePropertySerializer::StylePropertySetForSerializer::propertyAt(unsigned index) const
 {
     if (!hasExpandedAllProperty())
-        return StylePropertySerializer::PropertyValueForSerializer(m_propertySet.propertyAt(index));
+        return StylePropertySerializer::PropertyValueForSerializer(m_propertySet->propertyAt(index));
 
     CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
     ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
     if (m_longhandPropertyUsed.get(index)) {
-        int index = m_propertySet.findPropertyIndex(propertyID);
+        int index = m_propertySet->findPropertyIndex(propertyID);
         ASSERT(index != -1);
-        return StylePropertySerializer::PropertyValueForSerializer(m_propertySet.propertyAt(index));
+        return StylePropertySerializer::PropertyValueForSerializer(m_propertySet->propertyAt(index));
     }
 
-    StylePropertySet::PropertyReference property = m_propertySet.propertyAt(m_allIndex);
+    StylePropertySet::PropertyReference property = m_propertySet->propertyAt(m_allIndex);
     return StylePropertySerializer::PropertyValueForSerializer(propertyID, property.value(), property.isImportant());
 }
 
 bool StylePropertySerializer::StylePropertySetForSerializer::shouldProcessPropertyAt(unsigned index) const
 {
     // StylePropertySet has all valid longhands. We should process.
     if (!hasAllProperty())
         return true;
 
     // If all is not expanded, we need to process "all" and properties which
     // are not overwritten by "all".
     if (!m_needToExpandAll) {
-        StylePropertySet::PropertyReference property = m_propertySet.propertyAt(index);
+        StylePropertySet::PropertyReference property = m_propertySet->propertyAt(index);
         if (property.id() == CSSPropertyAll || !CSSProperty::isAffectedByAllProperty(property.id()))
             return true;
         return m_longhandPropertyUsed.get(property.id() - firstCSSProperty);
     }
 
     CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
     ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
 
     // Since "all" is expanded, we don't need to process "all".
     // We should not process expanded shorthands (e.g. font, background,
     // and so on) either.
     if (isShorthandProperty(propertyID) || propertyID == CSSPropertyAll)
         return false;
 
     // The all property is a shorthand that resets all CSS properties except
     // direction and unicode-bidi. It only accepts the CSS-wide keywords.
     // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
     if (!CSSProperty::isAffectedByAllProperty(propertyID))
         return m_longhandPropertyUsed.get(index);
 
     return true;
 }
 
 int StylePropertySerializer::StylePropertySetForSerializer::findPropertyIndex(CSSPropertyID propertyID) const
 {
     if (!hasExpandedAllProperty())
-        return m_propertySet.findPropertyIndex(propertyID);
+        return m_propertySet->findPropertyIndex(propertyID);
     return propertyID - firstCSSProperty;
 }
 
 const CSSValue* StylePropertySerializer::StylePropertySetForSerializer::getPropertyCSSValue(CSSPropertyID propertyID) const
 {
     int index = findPropertyIndex(propertyID);
     if (index == -1)
         return 0;
     StylePropertySerializer::PropertyValueForSerializer value = propertyAt(index);
     return value.value();
 }
 
 String StylePropertySerializer::StylePropertySetForSerializer::getPropertyValue(CSSPropertyID propertyID) const
 {
     if (!hasExpandedAllProperty())
-        return m_propertySet.getPropertyValue(propertyID);
+        return m_propertySet->getPropertyValue(propertyID);
 
     const CSSValue* value = getPropertyCSSValue(propertyID);
     if (!value)
         return String();
     return value->cssText();
 }
 
 bool StylePropertySerializer::StylePropertySetForSerializer::isPropertyImplicit(CSSPropertyID propertyID) const
 {
     int index = findPropertyIndex(propertyID);
@@ skipping 810 matching lines @@
             isInitialValue = false;
         if (!value->isInheritedValue())
             isInheritedValue = false;
         if (isImportant != m_propertySet.propertyIsImportant(shorthand.properties()[i]))
             return false;
     }
     return isInitialValue || isInheritedValue;
 }
 
 }