Changeset 76723 in webkit

Timestamp:

Jan 26, 2011 2:52:28 PM (13 years ago)

Author:

tony@chromium.org

Message:

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

Reviewed by Ryosuke Niwa.

[gtk] strip NUL characters when copying text/html on GTK+
​https://bugs.webkit.org/show_bug.cgi?id=52508

• editing/pasteboard/copy-null-characters.html: Make sure we didn't

change innerHTML (it should still contain the null)

• platform/gtk/Skipped: Re-enable the test

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

Reviewed by Ryosuke Niwa.

[gtk] strip NUL characters when copying text/html on GTK+
​https://bugs.webkit.org/show_bug.cgi?id=52508

Putting NUL characters in the text/html clipboard doesn't work in
WebKit GTK+ (the pasted value is truncated at the NUL). Since we're
already stripping this character for plain text (for Windows), strip
it in text/html too.

• editing/MarkupAccumulator.h: mark function as virtual
• editing/markup.cpp: (WebCore::StyledMarkupAccumulator::appendString): (WebCore::StyledMarkupAccumulator::takeResults): strip nulls

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/copy-null-characters.html (modified) (2 diffs)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/MarkupAccumulator.h (modified) (1 diff)
• Source/WebCore/editing/markup.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-26  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        [gtk] strip NUL characters when copying text/html on GTK+
+        https://bugs.webkit.org/show_bug.cgi?id=52508
+
+        * editing/pasteboard/copy-null-characters.html: Make sure we didn't
+            change innerHTML (it should still contain the null)
+        * platform/gtk/Skipped: Re-enable the test
+
 2011-01-26  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/editing/pasteboard/copy-null-characters.html

@@ -12 +12 @@
     var textWithNull = "Copy\0 paste me";
     source.textContent = textWithNull;
+
+    var results = document.getElementById("results");
+    // Make sure innerHTML still has the NULL.
+    if (source.innerHTML != textWithNull) {
+        results.innerText = "source.innerHTML has the wrong value (expected " +
+            JSON.stringify(textWithNull) + " but found " +
+            JSON.stringify(source.innerHTML) + ").";
+        Markup.dump(document.body);
+        Markup.notifyDone();
+        return;
+    }
+
     sel.setPosition(source, 0);
     document.execCommand("SelectAll");
@@ -24 +36 @@
     document.execCommand("Paste");
 
-    var results = document.getElementById("results");
     var expectedPlainTextValue = "Copy paste me";
     if (expectedPlainTextValue != destinationPlainText.value) {

trunk/LayoutTests/platform/gtk/Skipped

@@ -5273 +5273 @@
 http/tests/loading/cross-origin-XHR-willLoadRequest.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=52508
-editing/pasteboard/copy-null-characters.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=52798
 http/tests/security/local-CSS-from-remote.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-26  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        [gtk] strip NUL characters when copying text/html on GTK+
+        https://bugs.webkit.org/show_bug.cgi?id=52508
+
+        Putting NUL characters in the text/html clipboard doesn't work in
+        WebKit GTK+ (the pasted value is truncated at the NUL).  Since we're
+        already stripping this character for plain text (for Windows), strip
+        it in text/html too.
+
+        * editing/MarkupAccumulator.h: mark function as virtual
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::appendString):
+        (WebCore::StyledMarkupAccumulator::takeResults): strip nulls
+
 2011-01-26  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/editing/MarkupAccumulator.h

@@ -73 +73 @@
 
 protected:
-    void appendString(const String&);
+    virtual void appendString(const String&);
     void appendStartTag(Node*, Namespaces* = 0);
     void appendEndTag(Node*);

trunk/Source/WebCore/editing/markup.cpp

@@ -125 +125 @@
 
     Node* serializeNodes(Node* startNode, Node* pastEnd);
-    void appendString(const String& s) { return MarkupAccumulator::appendString(s); }
+    virtual void appendString(const String& s) { return MarkupAccumulator::appendString(s); }
     void wrapWithNode(Node*, bool convertBlocksToInlines = false, RangeFullySelectsNode = DoesFullySelectNode);
     void wrapWithStyleNode(CSSStyleDeclaration*, Document*, bool isBlock = false);
@@ -185 +185 @@
     concatenateMarkup(result);
 
-    return String::adopt(result);
+    // We remove '\0' characters because they are not visibly rendered to the user.
+    return String::adopt(result).replace(0, "");
 }