Changeset 16452 in webkit

Timestamp:

Sep 19, 2006 3:01:33 PM (18 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by harrison

• editing/pasteboard/pasting-tabs-expected.checksum: Added.
• editing/pasteboard/pasting-tabs-expected.png: Added.
• editing/pasteboard/pasting-tabs-expected.txt: Added.
• editing/pasteboard/pasting-tabs.html: Added.

WebCore:

Reviewed by harrison

<rdar://problem/4727383> REGRESSION: Pasting plain text with tabs into Blot converts the tabs to single spaces

Pasting plain text results in a match style paste, and the insertion
position is whitespace normal, which clobbers the whitespace:pre on
tab spans. Skip changes to the whitespace mode when computing a style
change for tab spans or the text nodes inside tab spans.

• editing/ApplyStyleCommand.cpp: (WebCore::StyleChange::init): Don't change the whitespace mode inside tab spans.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/pasting-tabs-expected.checksum (added)
• LayoutTests/editing/pasteboard/pasting-tabs-expected.png (added)
• LayoutTests/editing/pasteboard/pasting-tabs-expected.txt (added)
• LayoutTests/editing/pasteboard/pasting-tabs.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/ApplyStyleCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-09-19  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+
+        * editing/pasteboard/pasting-tabs-expected.checksum: Added.
+        * editing/pasteboard/pasting-tabs-expected.png: Added.
+        * editing/pasteboard/pasting-tabs-expected.txt: Added.
+        * editing/pasteboard/pasting-tabs.html: Added.
+
 2006-09-18  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-09-19  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+        
+        <rdar://problem/4727383> REGRESSION: Pasting plain text with tabs into Blot converts the tabs to single spaces
+
+        Pasting plain text results in a match style paste, and the insertion
+        position is whitespace normal, which clobbers the whitespace:pre on 
+        tab spans.  Skip changes to the whitespace mode when computing a style
+        change for tab spans or the text nodes inside tab spans.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::StyleChange::init): Don't change the whitespace mode inside
+        tab spans.
+
 2006-09-19  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/editing/ApplyStyleCommand.cpp

@@ -108 +108 @@
         // style, just move on.
         if (position.isNotNull() && currentlyHasStyle(position, property))
+            continue;
+        
+        // Changing the whitespace style in a tab span would collapse the tab into a space.
+        if (property->id() == CSS_PROP_WHITE_SPACE && (isTabSpanTextNode(position.node()) || isTabSpanNode((position.node()))))
             continue;