Revert of Oilpan: Move CSSStyleDeclaration and subclasses to the heap using transistion types.

Source/core/css/PropertySetCSSStyleDeclaration.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.
  *
  * 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 107 matching lines @@
     RefPtr<MutationRecord> m_mutation;
 };
 
 unsigned StyleAttributeMutationScope::s_scopeCount = 0;
 AbstractPropertySetCSSStyleDeclaration* StyleAttributeMutationScope::s_currentDecl = 0;
 bool StyleAttributeMutationScope::s_shouldNotifyInspector = false;
 bool StyleAttributeMutationScope::s_shouldDeliver = false;
 
 } // namespace
 
-#if !ENABLE(OILPAN)
 void PropertySetCSSStyleDeclaration::ref()
 {
     m_propertySet->ref();
 }
 
 void PropertySetCSSStyleDeclaration::deref()
 {
     m_propertySet->deref();
 }
-#endif
-
-void PropertySetCSSStyleDeclaration::trace(Visitor* visitor)
-{
-    visitor->trace(m_propertySet);
-    AbstractPropertySetCSSStyleDeclaration::trace(visitor);
-}
 
 unsigned AbstractPropertySetCSSStyleDeclaration::length() const
 {
     return propertySet().propertyCount();
 }
 
 String AbstractPropertySetCSSStyleDeclaration::item(unsigned i) const
 {
     if (i >= propertySet().propertyCount())
         return "";
@@ skipping 128 matching lines @@
 }
 
 CSSValue* AbstractPropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM(CSSValue* internalValue)
 {
     if (!internalValue)
         return 0;
 
     // The map is here to maintain the object identity of the CSSValues over multiple invocations.
     // FIXME: It is likely that the identity is not important for web compatibility and this code should be removed.
     if (!m_cssomCSSValueClones)
-        m_cssomCSSValueClones = adoptPtrWillBeNoop(new WillBeHeapHashMap<RawPtrWillBeMember<CSSValue>, RefPtrWillBeMember<CSSValue> >);
+        m_cssomCSSValueClones = adoptPtrWillBeNoop(new WillBeHeapHashMap<CSSValue*, RefPtrWillBeMember<CSSValue> >);
 
     RefPtrWillBeMember<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, RefPtrWillBeMember<CSSValue>()).storedValue->value;
     if (!clonedValue)
         clonedValue = internalValue->cloneForCSSOM();
     return clonedValue.get();
 }
 
 StyleSheetContents* AbstractPropertySetCSSStyleDeclaration::contextStyleSheet() const
 {
     CSSStyleSheet* cssStyleSheet = parentStyleSheet();
     return cssStyleSheet ? cssStyleSheet->contents() : 0;
 }
 
 PassRefPtrWillBeRawPtr<MutableStylePropertySet> AbstractPropertySetCSSStyleDeclaration::copyProperties() const
 {
     return propertySet().mutableCopy();
 }
 
 bool AbstractPropertySetCSSStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, const CSSValue* propertyValue) const
 {
     return propertySet().propertyMatches(propertyID, propertyValue);
 }
 
-void AbstractPropertySetCSSStyleDeclaration::trace(Visitor* visitor)
-{
-#if ENABLE(OILPAN)
-    visitor->trace(m_cssomCSSValueClones);
-#endif
-}
-
 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertySet& propertySetArg, CSSRule* parentRule)
     : PropertySetCSSStyleDeclaration(propertySetArg)
-#if !ENABLE(OILPAN)
     , m_refCount(1)
-#endif
     , m_parentRule(parentRule)
 {
-#if !ENABLE(OILPAN)
     m_propertySet->ref();
-#endif
 }
 
 StyleRuleCSSStyleDeclaration::~StyleRuleCSSStyleDeclaration()
 {
-#if !ENABLE(OILPAN)
     m_propertySet->deref();
-#endif
 }
 
-#if !ENABLE(OILPAN)
 void StyleRuleCSSStyleDeclaration::ref()
 {
     ++m_refCount;
 }
 
 void StyleRuleCSSStyleDeclaration::deref()
 {
     ASSERT(m_refCount);
     if (!--m_refCount)
         delete this;
 }
-#endif
 
 void StyleRuleCSSStyleDeclaration::willMutate()
 {
     if (m_parentRule && m_parentRule->parentStyleSheet())
         m_parentRule->parentStyleSheet()->willMutateRules();
 }
 
 void StyleRuleCSSStyleDeclaration::didMutate(MutationType type)
 {
     if (type == PropertyChanged)
         m_cssomCSSValueClones.clear();
 
     // Style sheet mutation needs to be signaled even if the change failed. willMutateRules/didMutateRules must pair.
     if (m_parentRule && m_parentRule->parentStyleSheet())
         m_parentRule->parentStyleSheet()->didMutateRules();
 }
 
 CSSStyleSheet* StyleRuleCSSStyleDeclaration::parentStyleSheet() const
 {
     return m_parentRule ? m_parentRule->parentStyleSheet() : 0;
 }
 
 void StyleRuleCSSStyleDeclaration::reattach(MutableStylePropertySet& propertySet)
 {
-#if !ENABLE(OILPAN)
     m_propertySet->deref();
-#endif
     m_propertySet = &propertySet;
-#if !ENABLE(OILPAN)
     m_propertySet->ref();
-#endif
-}
-
-void StyleRuleCSSStyleDeclaration::trace(Visitor* visitor)
-{
-    visitor->trace(m_parentRule);
-    PropertySetCSSStyleDeclaration::trace(visitor);
 }
 
 MutableStylePropertySet& InlineCSSStyleDeclaration::propertySet() const
 {
     return m_parentElement->ensureMutableInlineStyle();
 }
 
 void InlineCSSStyleDeclaration::didMutate(MutationType type)
 {
     if (type == NoChanges)
         return;
 
     m_cssomCSSValueClones.clear();
 
     if (!m_parentElement)
         return;
 
     m_parentElement->clearMutableInlineStyleIfEmpty();
     m_parentElement->setNeedsStyleRecalc(LocalStyleChange);
     m_parentElement->invalidateStyleAttribute();
     StyleAttributeMutationScope(this).didInvalidateStyleAttr();
 }
 
 CSSStyleSheet* InlineCSSStyleDeclaration::parentStyleSheet() const
 {
     return m_parentElement ? &m_parentElement->document().elementSheet() : 0;
 }
 
-#if !ENABLE(OILPAN)
 void InlineCSSStyleDeclaration::ref()
 {
     m_parentElement->ref();
 }
 
 void InlineCSSStyleDeclaration::deref()
 {
     m_parentElement->deref();
 }
-#endif
-
-void InlineCSSStyleDeclaration::trace(Visitor* visitor)
-{
-    AbstractPropertySetCSSStyleDeclaration::trace(visitor);
-}
 
 } // namespace WebCore