Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (152285 => 152286)
--- trunk/Source/WebCore/editing/EditingStyle.cpp 2013-07-02 11:56:29 UTC (rev 152285)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2013-07-02 12:20:22 UTC (rev 152286)
@@ -57,10 +57,6 @@
// 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.
static const CSSPropertyID editingProperties[] = {
- CSSPropertyBackgroundColor,
- CSSPropertyTextDecoration,
-
- // CSS inheritable properties
CSSPropertyColor,
CSSPropertyFontFamily,
CSSPropertyFontSize,
@@ -80,14 +76,22 @@
CSSPropertyWebkitTextFillColor,
CSSPropertyWebkitTextStrokeColor,
CSSPropertyWebkitTextStrokeWidth,
+
+ // Non-inheritable properties
+ CSSPropertyBackgroundColor,
+ CSSPropertyTextDecoration,
};
+const unsigned numAllEditingProperties = WTF_ARRAY_LENGTH(editingProperties);
+const unsigned numInheritableEditingProperties = numAllEditingProperties - 2;
+
+enum EditingPropertiesToInclude { OnlyInheritableEditingProperties, AllEditingProperties };
template <class StyleDeclarationType>
-static PassRefPtr<MutableStylePropertySet> copyEditingProperties(StyleDeclarationType* style, EditingStyle::EditingPropertiesToInclude type = EditingStyle::OnlyInheritableEditingProperties)
+static PassRefPtr<MutableStylePropertySet> copyEditingProperties(StyleDeclarationType* style, EditingPropertiesToInclude type)
{
- if (type == EditingStyle::AllEditingProperties)
- return style->copyPropertiesInSet(editingProperties, WTF_ARRAY_LENGTH(editingProperties));
- return style->copyPropertiesInSet(editingProperties + 2, WTF_ARRAY_LENGTH(editingProperties) - 2);
+ if (type == AllEditingProperties)
+ return style->copyPropertiesInSet(editingProperties, numAllEditingProperties);
+ return style->copyPropertiesInSet(editingProperties, numInheritableEditingProperties);
}
static inline bool isEditingProperty(int id)
@@ -99,10 +103,24 @@
return false;
}
-static PassRefPtr<MutableStylePropertySet> editingStyleFromComputedStyle(PassRefPtr<Node> node, EditingStyle::EditingPropertiesToInclude type = EditingStyle::OnlyInheritableEditingProperties)
+static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(ComputedStyleExtractor& computedStyle, EditingStyle::PropertiesToInclude propertiesToInclude)
{
+ switch (propertiesToInclude) {
+ case EditingStyle::AllProperties:
+ return computedStyle.copyProperties();
+ case EditingStyle::OnlyEditingInheritableProperties:
+ return copyEditingProperties(&computedStyle, OnlyInheritableEditingProperties);
+ case EditingStyle::EditingPropertiesInEffect:
+ return copyEditingProperties(&computedStyle, AllEditingProperties);
+ }
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+static PassRefPtr<MutableStylePropertySet> copyPropertiesFromComputedStyle(Node* node, EditingStyle::PropertiesToInclude propertiesToInclude)
+{
ComputedStyleExtractor computedStyle(node);
- return copyEditingProperties(&computedStyle, type);
+ return copyPropertiesFromComputedStyle(computedStyle, propertiesToInclude);
}
static PassRefPtr<CSSValue> extractPropertyValue(const StylePropertySet* style, CSSPropertyID propertyID)
@@ -115,20 +133,6 @@
return computedStyle->propertyValue(propertyID);
}
-static inline EditingStyle::EditingPropertiesToInclude toEditingProperties(EditingStyle::PropertiesToInclude properties)
-{
- switch (properties) {
- case EditingStyle::AllProperties:
- case EditingStyle::EditingPropertiesInEffect:
- return EditingStyle::AllEditingProperties;
- case EditingStyle::OnlyEditingInheritableProperties:
- return EditingStyle::OnlyInheritableEditingProperties;
- }
-
- ASSERT_NOT_REACHED();
- return EditingStyle::OnlyInheritableEditingProperties;
-}
-
template<typename T>
int identifierForStyleProperty(T* style, CSSPropertyID propertyID)
{
@@ -431,7 +435,10 @@
node = node->parentNode();
ComputedStyleExtractor computedStyleAtPosition(node);
- m_mutableStyle = propertiesToInclude == AllProperties ? computedStyleAtPosition.copyProperties() : editingStyleFromComputedStyle(node);
+ // FIXME: It's strange to not set background-color and text-decoration when propertiesToInclude is EditingPropertiesInEffect.
+ // However editing/selection/contains-boundaries.html fails without this ternary.
+ m_mutableStyle = copyPropertiesFromComputedStyle(computedStyleAtPosition,
+ propertiesToInclude == EditingPropertiesInEffect ? OnlyEditingInheritableProperties : propertiesToInclude);
if (propertiesToInclude == EditingPropertiesInEffect) {
if (RefPtr<CSSValue> value = backgroundColorInEffect(node))
@@ -599,8 +606,8 @@
{
if (!node || !node->parentNode())
return;
- RefPtr<MutableStylePropertySet> parentStyle = editingStyleFromComputedStyle(node->parentNode(), AllEditingProperties);
- RefPtr<MutableStylePropertySet> nodeStyle = editingStyleFromComputedStyle(node, AllEditingProperties);
+ RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+ RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
nodeStyle->removeEquivalentProperties(parentStyle.get());
m_mutableStyle->removeEquivalentProperties(nodeStyle.get());
}
@@ -610,8 +617,8 @@
if (!node || !node->parentNode() || !m_mutableStyle)
return;
- RefPtr<MutableStylePropertySet> parentStyle = editingStyleFromComputedStyle(node->parentNode(), AllEditingProperties);
- RefPtr<MutableStylePropertySet> nodeStyle = editingStyleFromComputedStyle(node, AllEditingProperties);
+ RefPtr<MutableStylePropertySet> parentStyle = copyPropertiesFromComputedStyle(node->parentNode(), EditingPropertiesInEffect);
+ RefPtr<MutableStylePropertySet> nodeStyle = copyPropertiesFromComputedStyle(node, EditingPropertiesInEffect);
nodeStyle->removeEquivalentProperties(parentStyle.get());
unsigned propertyCount = nodeStyle->propertyCount();
@@ -619,12 +626,6 @@
m_mutableStyle->removeProperty(nodeStyle->propertyAt(i).id());
}
-void EditingStyle::removeAllButEditingProperties(EditingPropertiesToInclude propertiesToInclude)
-{
- if (m_mutableStyle)
- m_mutableStyle = copyEditingProperties(m_mutableStyle.get(), propertiesToInclude);
-}
-
void EditingStyle::collapseTextDecorationProperties()
{
if (!m_mutableStyle)
@@ -981,11 +982,28 @@
&& (mode == EditingStyle::OverrideValues || !equivalent->propertyExistsInStyle(style));
}
+static PassRefPtr<MutableStylePropertySet> extractEditingProperties(const StylePropertySet* style, EditingStyle::PropertiesToInclude propertiesToInclude)
+{
+ if (!style)
+ return 0;
+
+ switch (propertiesToInclude) {
+ case EditingStyle::AllProperties:
+ case EditingStyle::EditingPropertiesInEffect:
+ return copyEditingProperties(style, AllEditingProperties);
+ case EditingStyle::OnlyEditingInheritableProperties:
+ return copyEditingProperties(style, OnlyInheritableEditingProperties);
+ }
+
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
void EditingStyle::mergeInlineAndImplicitStyleOfElement(StyledElement* element, CSSPropertyOverrideMode mode, PropertiesToInclude propertiesToInclude)
{
RefPtr<EditingStyle> styleFromRules = EditingStyle::create();
styleFromRules->mergeStyleFromRulesForSerialization(element);
- styleFromRules->removeAllButEditingProperties(toEditingProperties(propertiesToInclude));
+ styleFromRules->m_mutableStyle = extractEditingProperties(styleFromRules->m_mutableStyle.get(), propertiesToInclude);
mergeStyle(styleFromRules->m_mutableStyle.get(), mode);
mergeInlineStyleOfElement(element, mode, propertiesToInclude);
Modified: trunk/Source/WebCore/editing/EditingStyle.h (152285 => 152286)
--- trunk/Source/WebCore/editing/EditingStyle.h 2013-07-02 11:56:29 UTC (rev 152285)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2013-07-02 12:20:22 UTC (rev 152286)
@@ -64,7 +64,6 @@
public:
enum PropertiesToInclude { AllProperties, OnlyEditingInheritableProperties, EditingPropertiesInEffect };
- enum EditingPropertiesToInclude { OnlyInheritableEditingProperties, AllEditingProperties };
enum ShouldPreserveWritingDirection { PreserveWritingDirection, DoNotPreserveWritingDirection };
enum ShouldExtractMatchingStyle { ExtractMatchingStyle, DoNotExtractMatchingStyle };
@@ -109,7 +108,6 @@
void removeBlockProperties();
void removeStyleAddedByNode(Node*);
void removeStyleConflictingWithStyleOfNode(Node*);
- void removeAllButEditingProperties(EditingPropertiesToInclude = OnlyInheritableEditingProperties);
void collapseTextDecorationProperties();
enum ShouldIgnoreTextOnlyProperties { IgnoreTextOnlyProperties, DoNotIgnoreTextOnlyProperties };
TriState triStateOfStyle(EditingStyle*) const;
