Changeset 84311 in webkit

Timestamp:

Apr 19, 2011 4:37:32 PM (13 years ago)

Author:

enrica@apple.com

Message:

REGRESSION(r55762): Highlight color can't be copied in gmail.
​https://bugs.webkit.org/show_bug.cgi?id=58925
<rdar://problem/9253057>

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: editing/pasteboard/copy-text-with-backgroundcolor.html

The changes of r55762 uncovered the underlying issue here. The markup fragment
placed in the pasteboard does not contain the background color style.
This occurs only if the selection is limited to a single text node, whereas if the
selection spans across multiple nodes, the style is preserved correctly.
The fix consists in changing the logic that decides whether we should include the wrapping
node in the markup. That logic is based on the code in highestAncestorToWrapMarkup which relies
on isElementPresentational to choose candidates to be the wrapping node.
I've extended it to accept nodes that have non fully transparent background colors.

• editing/Editor.cpp:

(WebCore::Editor::hasTransparentBackgroundColor): Now is a static method of the class.

• editing/Editor.h:
• editing/markup.cpp:

(WebCore::isElementPresentational): Modified to use hasTransparentBackgroundColor.

LayoutTests:

The following test checks that when we copy a text node surrounded by an element that
has non transparent background color we preserve the background color as well.

• editing/pasteboard/copy-text-with-backgroundcolor-expected.txt: Added.
• editing/pasteboard/copy-text-with-backgroundcolor.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-text-with-backgroundcolor-expected.txt (added)
• LayoutTests/editing/pasteboard/copy-text-with-backgroundcolor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (1 diff)
• Source/WebCore/editing/Editor.h (modified) (1 diff)
• Source/WebCore/editing/markup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-19  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        REGRESSION(r55762): Highlight color can't be copied in gmail.
+        https://bugs.webkit.org/show_bug.cgi?id=58925
+        <rdar://problem/9253057>
+
+        The following test checks that when we copy a text node surrounded by an element that
+        has non transparent background color we preserve the background color as well.
+        
+        * editing/pasteboard/copy-text-with-backgroundcolor-expected.txt: Added.
+        * editing/pasteboard/copy-text-with-backgroundcolor.html: Added.
+
 2011-04-19  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-19  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Ryosuke Niwa.
+
+        REGRESSION(r55762): Highlight color can't be copied in gmail.
+        https://bugs.webkit.org/show_bug.cgi?id=58925
+        <rdar://problem/9253057>
+
+        Test: editing/pasteboard/copy-text-with-backgroundcolor.html
+
+        The changes of r55762 uncovered the underlying issue here. The markup fragment
+        placed in the pasteboard does not contain the background color style.
+        This occurs only if the selection is limited to a single text node, whereas if the
+        selection spans across multiple nodes, the style is preserved correctly.
+        The fix consists in changing the logic that decides whether we should include the wrapping
+        node in the markup. That logic is based on the code in highestAncestorToWrapMarkup which relies
+        on isElementPresentational to choose candidates to be the wrapping node.
+        I've extended it to accept nodes that have non fully transparent background colors.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::hasTransparentBackgroundColor): Now is a static method of the class.
+        * editing/Editor.h:
+        * editing/markup.cpp:
+        (WebCore::isElementPresentational): Modified to use hasTransparentBackgroundColor.
+
 2011-04-19  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -917 +917 @@
 }
 
-static bool hasTransparentBackgroundColor(CSSStyleDeclaration* style)
+bool Editor::hasTransparentBackgroundColor(CSSStyleDeclaration* style)
 {
     RefPtr<CSSValue> cssValue = style->getPropertyCSSValue(CSSPropertyBackgroundColor);

trunk/Source/WebCore/editing/Editor.h

@@ -199 +199 @@
     Command command(const String& commandName, EditorCommandSource);
     static bool commandIsSupportedFromMenuOrKeyBinding(const String& commandName); // Works without a frame.
+    static bool hasTransparentBackgroundColor(CSSStyleDeclaration*);
 
     bool insertText(const String&, Event* triggeringEvent);

trunk/Source/WebCore/editing/markup.cpp

@@ -466 +466 @@
     if (!style)
         return false;
-    return !propertyMissingOrEqualToNone(style.get(), CSSPropertyTextDecoration);
+    return !propertyMissingOrEqualToNone(style.get(), CSSPropertyTextDecoration) || !Editor::hasTransparentBackgroundColor(style.get());
 }