Partial implementation of inline StylePropertyMap.

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 3366 matching lines @@
         inlineStyle ? AtomicString(inlineStyle->asText()) : nullAtom);
 }
 
 CSSStyleDeclaration* Element::style()
 {
     if (!isStyledElement())
         return nullptr;
     return &ensureElementRareData().ensureInlineCSSStyleDeclaration(this);
 }
 
+StylePropertyMap* Element::styleMap()
+{
+    if (!isStyledElement())
+        return nullptr;
+    return &ensureElementRareData().ensureInlineStylePropertyMap(this);
+}
+
 MutableStylePropertySet& Element::ensureMutableInlineStyle()
 {
     ASSERT(isStyledElement());
     RefPtrWillBeMember<StylePropertySet>& inlineStyle = ensureUniqueElementData().m_inlineStyle;
     if (!inlineStyle) {
         CSSParserMode mode = (!isHTMLElement() || document().inQuirksMode()) ? HTMLQuirksMode : HTMLStandardMode;
         inlineStyle = MutableStylePropertySet::create(mode);
     } else if (!inlineStyle->isMutable()) {
         inlineStyle = inlineStyle->mutableCopy();
     }
@@ skipping 53 matching lines @@
     ASSERT(isStyledElement());
     setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Inline));
     ASSERT(elementData());
     elementData()->m_styleAttributeIsDirty = true;
     InspectorInstrumentation::didInvalidateStyleAttr(this);
 }
 
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, CSSValueID identifier, bool important)
 {
     ASSERT(isStyledElement());
-    ensureMutableInlineStyle().setProperty(propertyID, cssValuePool().createIdentifierValue(identifier), important);
+    RefPtrWillBeRawPtr<CSSValue> cssValue = cssValuePool().createIdentifierValue(identifier);

[Timothy Loh, 2016/02/09 07:29:32]

(btw at some point you'll want to look over your patch and undo the incidental
changes like this that arise from making and reverting changes)

[meade_UTC10, 2016/02/10 05:55:39]

Acknowledged.

+    ensureMutableInlineStyle().setProperty(propertyID, cssValue, important);
     inlineStyleChanged();
     return true;
 }
 
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitType unit, bool important)
 {
     ASSERT(isStyledElement());
-    ensureMutableInlineStyle().setProperty(propertyID, cssValuePool().createValue(value, unit), important);
+    RefPtrWillBeRawPtr<CSSValue> cssValue = cssValuePool().createValue(value, unit);
+    ensureMutableInlineStyle().setProperty(propertyID, cssValue, important);
     inlineStyleChanged();
     return true;
 }
 
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, const String& value, bool important)
 {
     ASSERT(isStyledElement());
-    bool changes = ensureMutableInlineStyle().setProperty(propertyID, value, important, document().elementSheet().contents());
-    if (changes)
+    MutableStylePropertySet& mutableStylePropertySet = ensureMutableInlineStyle();
+    bool changes = mutableStylePropertySet.setProperty(propertyID, value, important, document().elementSheet().contents());
+    if (changes) {
         inlineStyleChanged();
+    }
     return changes;
 }
 
+bool Element::setInlineStyleProperty(CSSPropertyID propertyID, const PassRefPtrWillBeRawPtr<CSSValue> value, bool important)
+{
+    ASSERT(isStyledElement());
+    ensureMutableInlineStyle().setProperty(propertyID, value);
+    inlineStyleChanged();
+    // This is the hook for InlineStylePropertyMap so don't update it here.
+    return true;
+}
+
 bool Element::removeInlineStyleProperty(CSSPropertyID propertyID)
 {
     ASSERT(isStyledElement());
     if (!inlineStyle())
         return false;
     bool changes = ensureMutableInlineStyle().removeProperty(propertyID);
-    if (changes)
+    if (changes) {
         inlineStyleChanged();
+    }
     return changes;
 }
 
 void Element::removeAllInlineStyleProperties()
 {
     ASSERT(isStyledElement());
     if (!inlineStyle())
         return;
     ensureMutableInlineStyle().clear();
     inlineStyleChanged();
 }
 
 void Element::updatePresentationAttributeStyle()
 {
     synchronizeAllAttributes();
     // ShareableElementData doesn't store presentation attribute style, so make sure we have a UniqueElementData.
     UniqueElementData& elementData = ensureUniqueElementData();
     elementData.m_presentationAttributeStyleIsDirty = false;
     elementData.m_presentationAttributeStyle = computePresentationAttributeStyle(*this);
 }
 
+void Element::invalidateInlineStylePropertyMap()
+{
+    if (!hasRareData())
+        return;
+    ElementRareData* rareData = elementRareData();
+    InlineStylePropertyMap* inlineStylePropertyMap = rareData->inlineStylePropertyMap();
+    if (!inlineStylePropertyMap) {
+        // Probably it's not being used, so don't bother. If/when one is created it will be filed in.
+        return;
+    }
+
+    inlineStylePropertyMap->invalidate();
+}
+
 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* style, CSSPropertyID propertyID, CSSValueID identifier)
 {
     ASSERT(isStyledElement());
     style->setProperty(propertyID, cssValuePool().createIdentifierValue(identifier));
 }
 
 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitType unit)
 {
     ASSERT(isStyledElement());
     style->setProperty(propertyID, cssValuePool().createValue(value, unit));
@@ skipping 102 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink