Have Element::ensureMutableInlineStyle() return a reference

Have Element::ensureMutableInlineStyle() return a reference

Have Element::ensureMutableInlineStyle() return a reference instead of a
pointer as it can never return null. This makes the calling code look safer.

Also update StyleRule*::properties() / StyleRule*::mutableProperties() to return
a reference as a result. This gets rid of several unnecessary null checks as
well.

R=adamk

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168044

[adamk, 2014-02-27 00:03:32]

lgtm

[commit-bot: I haz the power, 2014-02-27 00:05:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/181783005/1

[commit-bot: I haz the power, 2014-02-27 03:13:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-27 03:13:16]

Failed to apply patch for Source/core/dom/Element.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/dom/Element.cpp
  Hunk #2 succeeded at 3348 with fuzz 1.
  Hunk #3 FAILED at 3358.
  1 out of 9 hunks FAILED -- saving rejects to file
Source/core/dom/Element.cpp.rej

Patch:       Source/core/dom/Element.cpp
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index
6be8386d7e8af3438c153481e9deae2e3a438536..abf4ee2e324e3b49508b197d8f08dbaf39d70aab
100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -3096,7 +3096,7 @@ void Element::didMoveToNewDocument(Document& oldDocument)
     }
 
     if (needsURLResolutionForInlineStyle(*this, oldDocument, document()))
-        reResolveURLsInInlineStyle(document(), *ensureMutableInlineStyle());
+        reResolveURLsInInlineStyle(document(), ensureMutableInlineStyle());
 }
 
 void Element::updateNamedItemRegistration(const AtomicString& oldName, const
AtomicString& newName)
@@ -3348,7 +3348,7 @@ CSSStyleDeclaration* Element::style()
     return ensureElementRareData().ensureInlineCSSStyleDeclaration(this);
 }
 
-MutableStylePropertySet* Element::ensureMutableInlineStyle()
+MutableStylePropertySet& Element::ensureMutableInlineStyle()
 {
     ASSERT(isStyledElement());
     RefPtr<StylePropertySet>& inlineStyle =
ensureUniqueElementData()->m_inlineStyle;
@@ -3358,12 +3358,12 @@ MutableStylePropertySet*
Element::ensureMutableInlineStyle()
     } else if (!inlineStyle->isMutable()) {
         inlineStyle = inlineStyle->mutableCopy();
     }
-    return toMutableStylePropertySet(inlineStyle);
+    return *toMutableStylePropertySet(inlineStyle);
 }
 
 void Element::clearMutableInlineStyleIfEmpty()
 {
-    if (ensureMutableInlineStyle()->isEmpty()) {
+    if (ensureMutableInlineStyle().isEmpty()) {
         ensureUniqueElementData()->m_inlineStyle.clear();
     }
 }
@@ -3421,7 +3421,7 @@ void Element::inlineStyleChanged()
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, CSSValueID
identifier, bool important)
 {
     ASSERT(isStyledElement());
-    ensureMutableInlineStyle()->setProperty(propertyID,
cssValuePool().createIdentifierValue(identifier), important);
+    ensureMutableInlineStyle().setProperty(propertyID,
cssValuePool().createIdentifierValue(identifier), important);
     inlineStyleChanged();
     return true;
 }
@@ -3429,7 +3429,7 @@ bool Element::setInlineStyleProperty(CSSPropertyID
propertyID, CSSValueID identi
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, CSSPropertyID
identifier, bool important)
 {
     ASSERT(isStyledElement());
-    ensureMutableInlineStyle()->setProperty(propertyID,
cssValuePool().createIdentifierValue(identifier), important);
+    ensureMutableInlineStyle().setProperty(propertyID,
cssValuePool().createIdentifierValue(identifier), important);
     inlineStyleChanged();
     return true;
 }
@@ -3437,7 +3437,7 @@ bool Element::setInlineStyleProperty(CSSPropertyID
propertyID, CSSPropertyID ide
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, double value,
CSSPrimitiveValue::UnitTypes unit, bool important)
 {
     ASSERT(isStyledElement());
-    ensureMutableInlineStyle()->setProperty(propertyID,
cssValuePool().createValue(value, unit), important);
+    ensureMutableInlineStyle().setProperty(propertyID,
cssValuePool().createValue(value, unit), important);
     inlineStyleChanged();
     return true;
 }
@@ -3445,7 +3445,7 @@ bool Element::setInlineStyleProperty(CSSPropertyID
propertyID, double value, CSS
 bool Element::setInlineStyleProperty(CSSPropertyID propertyID, const String&
value, bool important)
 {
     ASSERT(isStyledElement());
-    bool changes = ensureMutableInlineStyle()->setProperty(propertyID, value,
important, document().elementSheet().contents());
+    bool changes = ensureMutableInlineStyle().setProperty(propertyID, value,
important, document().elementSheet().contents());
     if (changes)
         inlineStyleChanged();
     return changes;
@@ -3456,7 +3456,7 @@ bool Element::removeInlineStyleProperty(CSSPropertyID
propertyID)
     ASSERT(isStyledElement());
     if (!inlineStyle())
         return false;
-    bool changes = ensureMutableInlineStyle()->removeProperty(propertyID);
+    bool changes = ensureMutableInlineStyle().removeProperty(propertyID);
     if (changes)
         inlineStyleChanged();
     return changes;
@@ -3467,7 +3467,7 @@ void Element::removeAllInlineStyleProperties()
     ASSERT(isStyledElement());
     if (!inlineStyle())
         return;
-    ensureMutableInlineStyle()->clear();
+    ensureMutableInlineStyle().clear();
     inlineStyleChanged();
 }

[Inactive, 2014-02-27 15:45:13]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-02-27 15:45:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/181783005/20001

[commit-bot: I haz the power, 2014-02-27 18:08:29]

Change committed as 168044