Clean up after getPropertyCSSValue

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 154 matching lines @@
     willMutate();
 
     // FIXME: Detect syntax errors and set exceptionState.
     propertySet().parseDeclaration(text, contextStyleSheet());
 
     didMutate(PropertyChanged);
 
     mutationScope.enqueueMutationRecord();
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> AbstractPropertySetCSSStyleDeclaration::getPropertyCSSValue(const String& propertyName)
-{
-    CSSPropertyID propertyID = cssPropertyID(propertyName);
-    if (!propertyID)
-        return nullptr;
-    return cloneAndCacheForCSSOM(propertySet().getPropertyCSSValue(propertyID).get());
-}
-
 String AbstractPropertySetCSSStyleDeclaration::getPropertyValue(const String &propertyName)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (!propertyID)
         return String();
     return propertySet().getPropertyValue(propertyID);
 }
 
 String AbstractPropertySetCSSStyleDeclaration::getPropertyPriority(const String& propertyName)
 {
@@ skipping 70 matching lines @@
     willMutate();
 
     bool changed = propertySet().setProperty(propertyID, value, important, contextStyleSheet());
 
     didMutate(changed ? PropertyChanged : NoChanges);
 
     if (changed)
         mutationScope.enqueueMutationRecord();
 }
 
-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> >);
-
-    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
     CSSStyleDeclaration::trace(visitor);
 }
 
 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(MutableStylePropertySet& propertySetArg, CSSRule* parentRule)
     : PropertySetCSSStyleDeclaration(propertySetArg)
 #if !ENABLE(OILPAN)
     , m_refCount(1)
 #endif
     , m_parentRule(parentRule)
 {
@@ skipping 24 matching lines @@
 #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;
 }
 
@@ skipping 17 matching lines @@
 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, StyleChangeReasonForTracing::create(StyleChangeReason::StyleSheetChange));
     m_parentElement->invalidateStyleAttribute();
     StyleAttributeMutationScope(this).didInvalidateStyleAttr();
 }
 
 CSSStyleSheet* InlineCSSStyleDeclaration::parentStyleSheet() const
@@ skipping 13 matching lines @@
 }
 #endif
 
 void InlineCSSStyleDeclaration::trace(Visitor* visitor)
 {
     visitor->trace(m_parentElement);
     AbstractPropertySetCSSStyleDeclaration::trace(visitor);
 }
 
 } // namespace blink