Changeset 75861 in webkit

Timestamp:

Jan 14, 2011 6:06:08 PM (13 years ago)

Author:

tony@chromium.org

Message:

2011-01-14 Tony Chang <​tony@chromium.org>

Reviewed by Alexey Proskuryakov.

Strip NUL character when copying text on Windows
​https://bugs.webkit.org/show_bug.cgi?id=52236

• editing/pasteboard/copy-null-characters-expected.txt: Added.
• editing/pasteboard/copy-null-characters.html: Added.

2011-01-14 Tony Chang <​tony@chromium.org>

Reviewed by Alexey Proskuryakov.

Strip NUL character when copying text on Windows
​https://bugs.webkit.org/show_bug.cgi?id=52236

Test: editing/pasteboard/copy-null-characters.html

• editing/Editor.cpp: (WebCore::Editor::selectedText):
• platform/mac/PasteboardMac.mm: (WebCore::Pasteboard::writeSelection): Use editor()->selectedText() which matches the other platforms.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-null-characters-expected.txt (added)
• LayoutTests/editing/pasteboard/copy-null-characters.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (1 diff)
• Source/WebCore/platform/mac/PasteboardMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-14  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Strip NUL character when copying text on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=52236
+
+        * editing/pasteboard/copy-null-characters-expected.txt: Added.
+        * editing/pasteboard/copy-null-characters.html: Added.
+
 2011-01-14  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-14  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Strip NUL character when copying text on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=52236
+
+        Test: editing/pasteboard/copy-null-characters.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectedText):
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::writeSelection): Use editor()->selectedText() which matches the other platforms.
+
 2011-01-14  Yuzo Fujishima  <yuzo@google.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -3033 +3033 @@
 String Editor::selectedText() const
 {
-    return plainText(m_frame->selection()->toNormalizedRange().get());
+    // We remove '\0' characters because they are not visibly rendered to the user.
+    return plainText(m_frame->selection()->toNormalizedRange().get()).replace(0, "");
 }
 

trunk/Source/WebCore/platform/mac/PasteboardMac.mm

@@ -192 +192 @@
         // Map   to a plain old space because this is better for source code, other browsers do it,
         // and because HTML forces you to do this any time you want two spaces in a row.
-        String text = selectedRange->text();
+        String text = frame->editor()->selectedText();
         NSMutableString *s = [[[(NSString*)text copy] autorelease] mutableCopy];