Move (copy/remove)BlockProperties out of MutableStylePropertySet

Source/core/editing/EditingStyle.cpp

Index: Source/core/editing/EditingStyle.cpp
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
index 053be543ff09367a2ec05f1721bdd8da099aa9ba..52a3c39c96301892632d7f7bacee2d4b5bc6184c 100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -594,14 +594,45 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::copy() const
     return copy;
 }
 
+// This is the list of CSS properties that apply specially to block-level elements.
+static const CSSPropertyID staticBlockProperties[] = {
+    CSSPropertyOrphans,
+    CSSPropertyOverflow, // This can be also be applied to replaced elements
+    CSSPropertyWebkitColumnCount,
+    CSSPropertyWebkitColumnGap,
+    CSSPropertyWebkitColumnRuleColor,
+    CSSPropertyWebkitColumnRuleStyle,
+    CSSPropertyWebkitColumnRuleWidth,
+    CSSPropertyWebkitColumnBreakBefore,
+    CSSPropertyWebkitColumnBreakAfter,
+    CSSPropertyWebkitColumnBreakInside,
+    CSSPropertyWebkitColumnWidth,
+    CSSPropertyPageBreakAfter,
+    CSSPropertyPageBreakBefore,
+    CSSPropertyPageBreakInside,
+    CSSPropertyTextAlign,
+    CSSPropertyTextAlignLast,
+    CSSPropertyTextIndent,
+    CSSPropertyTextJustify,
+    CSSPropertyWidows
+};
+
+static const Vector<CSSPropertyID>& blockPropertiesVector()
+{
+    DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ());
+    if (properties.isEmpty())
+        CSSPropertyMetadata::filterEnabledCSSPropertiesIntoVector(staticBlockProperties, WTF_ARRAY_LENGTH(staticBlockProperties), properties);
+    return properties;
+}
+
 PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::extractAndRemoveBlockProperties()
 {
     RefPtrWillBeRawPtr<EditingStyle> blockProperties = EditingStyle::create();
     if (!m_mutableStyle)
         return blockProperties;
 
-    blockProperties->m_mutableStyle = m_mutableStyle->copyBlockProperties();
-    m_mutableStyle->removeBlockProperties();
+    blockProperties->m_mutableStyle = m_mutableStyle->copyPropertiesInSet(blockPropertiesVector());
+    removeBlockProperties();
 
     return blockProperties;
 }
@@ -625,7 +656,7 @@ void EditingStyle::removeBlockProperties()
     if (!m_mutableStyle)
         return;
 
-    m_mutableStyle->removeBlockProperties();
+    m_mutableStyle->removePropertiesInSet(blockPropertiesVector().data(), blockPropertiesVector().size());

[rune, 2015/06/16 06:46:59]

I thought removePropertiesFromSet sounded better. Likewise,
copyPropertiesFromSet. But then I realized you might be referring to
blockPropertiesVector() as the "set"?

[Timothy Loh, 2015/06/17 01:31:43]

I didn't really look at the names since I was just moving out a couple of
functions, but yeah removePropertiesFromSet might be misleading here.

 }
 
 void EditingStyle::removeStyleAddedByElement(Element* element)