Changeset 19949 in webkit

Timestamp:

Mar 2, 2007 3:02:49 PM (17 years ago)

Author:

justing

Message:

LayoutTests:

Reviewed by harrison

<rdar://problem/4545040>
innerHTML does not HTML-escape text nodes inside PRE elements
<rdar://problem/5027857>
Pasting into Mail from Safari's view-source window renders the HTML

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

WebCore:

Reviewed by harrison

<rdar://problem/4545040>
innerHTML does not HTML-escape text nodes inside PRE elements
<rdar://problem/5027857>
Pasting into Mail from Safari's view-source window renders the HTML

• editing/HTMLInterchange.cpp: (WebCore::convertHTMLTextToInterchangeFormat): Send this function the node that the text comes from as a parameter. It shouldn't convert '\n's to spaces/nbsps if the text is coming from text where newlines are preserved.
• editing/HTMLInterchange.h:
• editing/markup.cpp: (WebCore::startMarkup): Escape text inside the children of PREs.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/5027857-expected.checksum (added)
• LayoutTests/editing/pasteboard/5027857-expected.png (added)
• LayoutTests/editing/pasteboard/5027857-expected.txt (added)
• LayoutTests/editing/pasteboard/5027857.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/HTMLInterchange.cpp (modified) (2 diffs)
• WebCore/editing/HTMLInterchange.h (modified) (2 diffs)
• WebCore/editing/markup.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-02  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+        
+        <rdar://problem/4545040>
+        innerHTML does not HTML-escape text nodes inside PRE elements
+        <rdar://problem/5027857>
+        Pasting into Mail from Safari's view-source window renders the HTML
+
+        * editing/pasteboard/5027857-expected.checksum: Added.
+        * editing/pasteboard/5027857-expected.png: Added.
+        * editing/pasteboard/5027857-expected.txt: Added.
+        * editing/pasteboard/5027857.html: Added.
+
 2007-03-02  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-02  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+
+        <rdar://problem/4545040>
+        innerHTML does not HTML-escape text nodes inside PRE elements
+        <rdar://problem/5027857>
+        Pasting into Mail from Safari's view-source window renders the HTML
+
+        * editing/HTMLInterchange.cpp:
+        (WebCore::convertHTMLTextToInterchangeFormat): Send this function
+        the node that the text comes from as a parameter.  It shouldn't convert
+        '\n's to spaces/nbsps if the text is coming from text where newlines are
+        preserved.
+        * editing/HTMLInterchange.h:
+        * editing/markup.cpp:
+        (WebCore::startMarkup): Escape text inside the children of PREs.
+
 2007-03-02  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/editing/HTMLInterchange.cpp

@@ -29 +29 @@
 #include "CharacterNames.h"
 #include "Document.h"
+#include "Text.h"
 #include "TextIterator.h"
 
@@ -50 +51 @@
 } // end anonymous namespace
 
-// FIXME: Can't really do this work without taking whitespace mode into account.
-// This means that eventually this function needs to be eliminated or at least have
-// its parameters changed because it can't do its work on the string without knowing
-// what parts are in what whitespace mode.
-DeprecatedString convertHTMLTextToInterchangeFormat(const DeprecatedString &in)
+DeprecatedString convertHTMLTextToInterchangeFormat(const DeprecatedString& in, const Text* node)
 {
+    // Assume all the text comes from node.
+    if (node->renderer() && node->renderer()->style()->preserveNewline())
+        return in;
+        
     DeprecatedString s;
 

trunk/WebCore/editing/HTMLInterchange.h

@@ -30 +30 @@
 
 class DeprecatedString;
+class Text;
 
 #define AppleInterchangeNewline   "Apple-interchange-newline"
@@ -39 +40 @@
 enum EAnnotateForInterchange { DoNotAnnotateForInterchange, AnnotateForInterchange };
 
-DeprecatedString convertHTMLTextToInterchangeFormat(const DeprecatedString&);
+DeprecatedString convertHTMLTextToInterchangeFormat(const DeprecatedString&, const Text*);
 
 }

trunk/WebCore/editing/markup.cpp

@@ -161 +161 @@
             if (Node* parent = node->parentNode()) {
                 if (parent->hasTagName(listingTag)
-                        || parent->hasTagName(preTag)
                         || parent->hasTagName(scriptTag)
                         || parent->hasTagName(styleTag)
@@ -169 +168 @@
             }
             bool useRenderedText = annotate && !enclosingNodeWithTag(const_cast<Node*>(node), selectTag);
-            
             DeprecatedString markup = useRenderedText ? escapeTextForMarkup(renderedText(node, range), false) : escapeTextForMarkup(stringValueForRange(node, range).deprecatedString(), false);
             if (defaultStyle) {
@@ -189 +187 @@
                 }            
             }
-            return annotate ? convertHTMLTextToInterchangeFormat(markup) : markup;
+            return annotate ? convertHTMLTextToInterchangeFormat(markup, static_cast<const Text*>(node)) : markup;
         }
         case Node::COMMENT_NODE: