Changeset 104068 in webkit

Timestamp:

Jan 4, 2012 2:05:18 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION (r92823): Background color not preserved when copying and pasting a table row
​https://bugs.webkit.org/show_bug.cgi?id=75330

Reviewed by Tony Chang.

Source/WebCore:

The bug was caused by the background color of the wrapping style overriding the background color
in a matched rule of a highest element to be serialized. Fixed the bug by removing the conflicting
background color prior to the merge.

Tests: editing/pasteboard/copy-element-with-conflicting-background-color-from-rule-expected.html

editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html

• editing/EditingStyle.cpp:

(WebCore::editingStyleFromComputedStyle):
(WebCore::EditingStyle::removeStyleAddedByNode):
(WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode):

LayoutTests:

Add a regression test.

• editing/pasteboard/copy-element-with-conflicting-background-color-from-rule-expected.html: Added.
• editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-element-with-conflicting-background-color-from-rule-expected.html (added)
• LayoutTests/editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/editing/EditingStyle.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-03  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r92823): Background color not preserved when copying and pasting a table row
+        https://bugs.webkit.org/show_bug.cgi?id=75330
+
+        Reviewed by Tony Chang.
+
+        Add a regression test.
+
+        * editing/pasteboard/copy-element-with-conflicting-background-color-from-rule-expected.html: Added.
+        * editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html: Added.
+
 2012-01-04  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-03  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r92823): Background color not preserved when copying and pasting a table row
+        https://bugs.webkit.org/show_bug.cgi?id=75330
+
+        Reviewed by Tony Chang.
+
+        The bug was caused by the background color of the wrapping style overriding the background color
+        in a matched rule of a highest element to be serialized. Fixed the bug by removing the conflicting
+        background color prior to the merge.
+
+        Tests: editing/pasteboard/copy-element-with-conflicting-background-color-from-rule-expected.html
+               editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html
+
+        * editing/EditingStyle.cpp:
+        (WebCore::editingStyleFromComputedStyle):
+        (WebCore::EditingStyle::removeStyleAddedByNode):
+        (WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode):
+
 2012-01-03  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -707 +707 @@
 void Element::recalcStyleIfNeededAfterAttributeChanged(Attribute* attr)
 {
-    if (document()->attached() && document()->styleSelector()->hasSelectorForAttribute(attr->name().localName()))
+    if (!needsStyleRecalc())
+        return;
+
+    if (document()->attached() && document()->styleSelectorIfExists() && document()->styleSelectorIfExists()->hasSelectorForAttribute(attr->name().localName()))
         setNeedsStyleRecalc();
 }

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -81 +81 @@
 };
 
-static PassRefPtr<CSSMutableStyleDeclaration> copyEditingProperties(CSSStyleDeclaration* style, bool includeNonInheritableProperties = false)
-{
-    if (includeNonInheritableProperties)
+enum EditingPropertiesType { OnlyInheritableEditingProperties, AllEditingProperties };
+
+static PassRefPtr<CSSMutableStyleDeclaration> copyEditingProperties(CSSStyleDeclaration* style, EditingPropertiesType type = OnlyInheritableEditingProperties)
+{
+    if (type == AllEditingProperties)
         return style->copyPropertiesInSet(editingProperties, WTF_ARRAY_LENGTH(editingProperties));
     return style->copyPropertiesInSet(editingProperties + 2, WTF_ARRAY_LENGTH(editingProperties) - 2);
@@ -97 +99 @@
 }
 
-static PassRefPtr<CSSMutableStyleDeclaration> editingStyleFromComputedStyle(PassRefPtr<CSSComputedStyleDeclaration> style)
+static PassRefPtr<CSSMutableStyleDeclaration> editingStyleFromComputedStyle(PassRefPtr<CSSComputedStyleDeclaration> style, EditingPropertiesType type = OnlyInheritableEditingProperties)
 {
     if (!style)
         return CSSMutableStyleDeclaration::create();
-    return copyEditingProperties(style.get());
+    return copyEditingProperties(style.get(), type);
 }
 
@@ -544 +546 @@
     if (!node || !node->parentNode())
         return;
-    RefPtr<CSSMutableStyleDeclaration> parentStyle = editingStyleFromComputedStyle(computedStyle(node->parentNode()));
-    RefPtr<CSSMutableStyleDeclaration> nodeStyle = editingStyleFromComputedStyle(computedStyle(node));
+    RefPtr<CSSMutableStyleDeclaration> parentStyle = editingStyleFromComputedStyle(computedStyle(node->parentNode()), AllEditingProperties);
+    RefPtr<CSSMutableStyleDeclaration> nodeStyle = editingStyleFromComputedStyle(computedStyle(node), AllEditingProperties);
     parentStyle->diff(nodeStyle.get());
     nodeStyle->diff(m_mutableStyle.get());
@@ -554 +556 @@
     if (!node || !node->parentNode() || !m_mutableStyle)
         return;
-    RefPtr<CSSMutableStyleDeclaration> parentStyle = editingStyleFromComputedStyle(computedStyle(node->parentNode()));
-    RefPtr<CSSMutableStyleDeclaration> nodeStyle = editingStyleFromComputedStyle(computedStyle(node));
+
+    RefPtr<CSSMutableStyleDeclaration> parentStyle = editingStyleFromComputedStyle(computedStyle(node->parentNode()), AllEditingProperties);
+    RefPtr<CSSMutableStyleDeclaration> nodeStyle = editingStyleFromComputedStyle(computedStyle(node), AllEditingProperties);
     parentStyle->diff(nodeStyle.get());
 
@@ -904 +907 @@
         return;
     case OnlyEditingInheritableProperties:
+        mergeStyle(copyEditingProperties(element->inlineStyleDecl(), OnlyInheritableEditingProperties).get(), mode);
+        return;
     case EditingPropertiesInEffect:
-        mergeStyle(copyEditingProperties(element->inlineStyleDecl(), propertiesToInclude == EditingPropertiesInEffect).get(), mode);
+        mergeStyle(copyEditingProperties(element->inlineStyleDecl(), AllEditingProperties).get(), mode);
         return;
     }