Replace error-prone value with check from CSSProperty

Replace error-prone value with check from CSSProperty

In EditingStyle, there is a static integer that specifies the number of
non-inherited editing properties, that needed to appear in the beginning
of editingProperties vector. A better approach is to have a runtime
check using CSSProperty::isInheritedProperty().

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

[Julien - ping for review, 2013-08-07 23:41:38]

lgtm

[commit-bot: I haz the power, 2013-08-07 23:41:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bruno.d@partner.samsung.com/22378004/1

[commit-bot: I haz the power, 2013-08-07 23:41:49]

Failed to apply patch for Source/core/editing/EditingStyle.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/editing/EditingStyle.cpp
  Hunk #1 FAILED at 58.
  Hunk #2 succeeded at 87 (offset 9 lines).
  Hunk #3 succeeded at 118 (offset 15 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/editing/EditingStyle.cpp.rej

Patch:       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
07d155599197d256996d15a817e643e2241a69f5..ffd2d8d4c3f03490a7cc382eab5629ae7a2c878a
100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -58,16 +58,10 @@ namespace WebCore {
 
 // Editing style properties must be preserved during editing operation.
 // e.g. when a user inserts a new paragraph, all properties listed here must be
copied to the new paragraph.
-// NOTE: Use editingProperties() to respect runtime enabling of properties.
-static const unsigned nonInheritedStaticPropertiesCount = 2;
-
+// NOTE: Use either allEditingProperties() or inheritableEditingProperties() to
+// respect runtime enabling of properties.
 static const CSSPropertyID staticEditingProperties[] = {
-    // NOTE: inheritableEditingProperties depends on these two properties being
first.
-    // If you change this list, make sure to update nonInheritedPropertyCount.
     CSSPropertyBackgroundColor,
-    CSSPropertyTextDecoration,
-
-    // CSS inheritable properties
     CSSPropertyColor,
     CSSPropertyFontFamily,
     CSSPropertyFontSize,
@@ -78,6 +72,7 @@ static const CSSPropertyID staticEditingProperties[] = {
     CSSPropertyLineHeight,
     CSSPropertyOrphans,
     CSSPropertyTextAlign,
+    CSSPropertyTextDecoration,
     CSSPropertyTextIndent,
     CSSPropertyTextTransform,
     CSSPropertyWhiteSpace,
@@ -102,8 +97,16 @@ static const Vector<CSSPropertyID>& allEditingProperties()
 static const Vector<CSSPropertyID>& inheritableEditingProperties()
 {
     DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ());
-    if (properties.isEmpty())
-       
RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingProperties
+ nonInheritedStaticPropertiesCount, WTF_ARRAY_LENGTH(staticEditingProperties) -
nonInheritedStaticPropertiesCount, properties);
+    if (properties.isEmpty()) {
+       
RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingProperties,
WTF_ARRAY_LENGTH(staticEditingProperties), properties);
+        for (size_t index = 0; index < properties.size();) {
+            if (!CSSProperty::isInheritedProperty(properties[index])) {
+                properties.remove(index);
+                continue;
+            }
+            ++index;
+        }
+    }
     return properties;
 }

[commit-bot: I haz the power, 2013-08-08 00:10:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bruno.d@partner.samsung.com/22378004/8001

[commit-bot: I haz the power, 2013-08-08 01:52:43]

Retried try job too often on mac_blink_rel for step(s) webkit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_blink_...

[commit-bot: I haz the power, 2013-08-08 09:08:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bruno.d@partner.samsung.com/22378004/8001

[commit-bot: I haz the power, 2013-08-08 11:22:45]

Failed to apply patch for Source/core/editing/EditingStyle.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/editing/EditingStyle.cpp
  Hunk #1 FAILED at 64.
  Hunk #2 succeeded at 78 (offset -9 lines).
  Hunk #3 succeeded at 106 (offset -15 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/editing/EditingStyle.cpp.rej

Patch:       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
fc85bc256081288ad644ffb99ead339982656065..04247cba1a44d3e947364a9df5f1146534cd5953
100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -64,19 +64,10 @@ static const CSSPropertyID&
textDecorationPropertyForEditing()
 
 // Editing style properties must be preserved during editing operation.
 // e.g. when a user inserts a new paragraph, all properties listed here must be
copied to the new paragraph.
-// NOTE: Use editingProperties() to respect runtime enabling of properties.
-static const unsigned nonInheritedStaticPropertiesCount = 3;
-
+// NOTE: Use either allEditingProperties() or inheritableEditingProperties() to
+// respect runtime enabling of properties.
 static const CSSPropertyID staticEditingProperties[] = {
-    // NOTE: inheritableEditingProperties depends on these properties being
first.
-    // If you change this list, make sure to update nonInheritedPropertyCount.
     CSSPropertyBackgroundColor,
-    // FIXME: CSSPropertyTextDecoration needs to be removed when CSS3 Text
-    // Decoration feature is no longer experimental.
-    CSSPropertyTextDecoration,
-    CSSPropertyTextDecorationLine,
-
-    // CSS inheritable properties
     CSSPropertyColor,
     CSSPropertyFontFamily,
     CSSPropertyFontSize,
@@ -87,6 +78,10 @@ static const CSSPropertyID staticEditingProperties[] = {
     CSSPropertyLineHeight,
     CSSPropertyOrphans,
     CSSPropertyTextAlign,
+    // FIXME: CSSPropertyTextDecoration needs to be removed when CSS3 Text
+    // Decoration feature is no longer experimental.
+    CSSPropertyTextDecoration,
+    CSSPropertyTextDecorationLine,
     CSSPropertyTextIndent,
     CSSPropertyTextTransform,
     CSSPropertyWhiteSpace,
@@ -117,8 +112,16 @@ static const Vector<CSSPropertyID>& allEditingProperties()
 static const Vector<CSSPropertyID>& inheritableEditingProperties()
 {
     DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ());
-    if (properties.isEmpty())
-       
RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingProperties
+ nonInheritedStaticPropertiesCount, WTF_ARRAY_LENGTH(staticEditingProperties) -
nonInheritedStaticPropertiesCount, properties);
+    if (properties.isEmpty()) {
+       
RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingProperties,
WTF_ARRAY_LENGTH(staticEditingProperties), properties);
+        for (size_t index = 0; index < properties.size();) {
+            if (!CSSProperty::isInheritedProperty(properties[index])) {
+                properties.remove(index);
+                continue;
+            }
+            ++index;
+        }
+    }
     return properties;
 }

[commit-bot: I haz the power, 2013-08-08 15:47:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bruno.d@partner.samsung.com/22378004/2...

[commit-bot: I haz the power, 2013-08-08 21:13:00]

Change committed as 155788