Changeset 8096 in webkit

Timestamp:

Dec 1, 2004 1:52:22 PM (19 years ago)

Author:

kocienda

Message:

Reviewed by Hyatt

Some improvements for paste, including some new code to annotate
whitespace when writing to the pasteboard to ensure that the meaning
of the markup on the pasteboard is unambiguous.

There is also new code for reading this annotated markup from the pasteboard,
removing the nodes that were added only to prevent ambiguity.

• WebCore.pbproj/project.pbxproj: Added html_interchange.h and html_interchange.cpp files. The header should have been added earlier, but I did not do so.
• khtml/editing/html_interchange.cpp: Added. (convertHTMLTextToInterchangeFormat):
• khtml/editing/html_interchange.h: Added some new constants for use with whitespace annotations.
• khtml/editing/htmlediting.cpp: (khtml::ReplacementFragment::ReplacementFragment): Now looks for and removes annotations added for whitespace. Also fixed a bug in the code that counts blocks in a fragment. (khtml::ReplacementFragment::isInterchangeConvertedSpaceSpan): New helper. Recognizes annotation spans. (khtml::ReplacementFragment::insertNodeBefore): New helper. (khtml::ReplaceSelectionCommand::doApply): Fixed a bug in the code that sets the start position for the replacement after deleting. This was causing a bug when pasting at the end of a block.
• khtml/editing/htmlediting.h: Add some new declarations.
• khtml/xml/dom2_rangeimpl.cpp: (DOM::RangeImpl::toHTML): Calls to startMarkup now pass true for the new annotate flag.
• khtml/xml/dom_nodeimpl.cpp: (NodeImpl::stringValueForRange): New helper. (NodeImpl::renderedText): New helper to return only the rendered text in a node. (NodeImpl::startMarkup): Now takes an additional flag to control whether interchange annotations should be added. Called by the paste code.
• khtml/xml/dom_nodeimpl.h: Added and modified function declarations.

New test to check the khtml::ReplaceSelectionCommand::doApply fix.

• layout-tests/editing/pasteboard/paste-text-010-expected.txt: Added.
• layout-tests/editing/pasteboard/paste-text-010.html: Added.

Location:

trunk

Files:

• LayoutTests/editing/pasteboard/paste-text-010-expected.txt (added)
• LayoutTests/editing/pasteboard/paste-text-010.html (added)
• WebCore/ChangeLog-2005-08-23 (modified) (1 diff)
• WebCore/WebCore.pbproj/project.pbxproj (modified) (3 diffs)
• WebCore/khtml/editing/html_interchange.cpp (added)
• WebCore/khtml/editing/html_interchange.h (modified) (1 diff)
• WebCore/khtml/editing/htmlediting.cpp (modified) (6 diffs)
• WebCore/khtml/editing/htmlediting.h (modified) (1 diff)
• WebCore/khtml/xml/dom2_rangeimpl.cpp (modified) (4 diffs)
• WebCore/khtml/xml/dom_nodeimpl.cpp (modified) (2 diffs)
• WebCore/khtml/xml/dom_nodeimpl.h (modified) (2 diffs)

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2004-12-01  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Hyatt
+        
+        Some improvements for paste, including some new code to annotate
+        whitespace when writing to the pasteboard to ensure that the meaning
+        of the markup on the pasteboard is unambiguous.
+        
+        There is also new code for reading this annotated markup from the pasteboard,
+        removing the nodes that were added only to prevent ambiguity.
+
+        * WebCore.pbproj/project.pbxproj: Added html_interchange.h and html_interchange.cpp files.
+        The header should have been added earlier, but I did not do so.
+        * khtml/editing/html_interchange.cpp: Added.
+        (convertHTMLTextToInterchangeFormat):
+        * khtml/editing/html_interchange.h: Added some new constants for use with whitespace annotations.
+        * khtml/editing/htmlediting.cpp:
+        (khtml::ReplacementFragment::ReplacementFragment): Now looks for and removes annotations added for whitespace.
+        Also fixed a bug in the code that counts blocks in a fragment.
+        (khtml::ReplacementFragment::isInterchangeConvertedSpaceSpan): New helper. Recognizes annotation spans.
+        (khtml::ReplacementFragment::insertNodeBefore): New helper.
+        (khtml::ReplaceSelectionCommand::doApply): Fixed a bug in the code that sets the start position
+        for the replacement after deleting. This was causing a bug when pasting at the end of a block.
+        * khtml/editing/htmlediting.h: Add some new declarations.
+        * khtml/xml/dom2_rangeimpl.cpp:
+        (DOM::RangeImpl::toHTML): Calls to startMarkup now pass true for the new annotate flag.
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeImpl::stringValueForRange): New helper.
+        (NodeImpl::renderedText): New helper to return only the rendered text in a node.
+        (NodeImpl::startMarkup): Now takes an additional flag to control whether interchange annotations
+        should be added. Called by the paste code.
+        * khtml/xml/dom_nodeimpl.h: Added and modified function declarations.
+
+        New test to check the khtml::ReplaceSelectionCommand::doApply fix.
+        * layout-tests/editing/pasteboard/paste-text-010-expected.txt: Added.
+        * layout-tests/editing/pasteboard/paste-text-010.html: Added.
+
 2004-11-30  Chris Blumenberg  <cblu@apple.com>
 

trunk/WebCore/WebCore.pbproj/project.pbxproj

@@ -540 +540 @@
                                 939FF8EF0702B1B100979E5E,
                                 BECE67BE07087B250007C14B,
+                                BEA5E01E075CEDAC0098A432,
                         );
                         isa = PBXHeadersBuildPhase;
@@ -827 +828 @@
                                 93ABE074070285F600BD91F9,
                                 939FF8EE0702B1B100979E5E,
+                                BEA5DBDB075CEDA00098A432,
                         );
                         isa = PBXSourcesBuildPhase;
@@ -3391 +3393 @@
                         };
                 };
+                BEA5DBDA075CEDA00098A432 = {
+                        fileEncoding = 30;
+                        isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.cpp.cpp;
+                        name = html_interchange.cpp;
+                        path = editing/html_interchange.cpp;
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                BEA5DBDB075CEDA00098A432 = {
+                        fileRef = BEA5DBDA075CEDA00098A432;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
+                BEA5E01D075CEDAC0098A432 = {
+                        fileEncoding = 30;
+                        isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.c.h;
+                        name = html_interchange.h;
+                        path = editing/html_interchange.h;
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                BEA5E01E075CEDAC0098A432 = {
+                        fileRef = BEA5E01D075CEDAC0098A432;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
                 BEB1DD0805C197DF00DD1F43 = {
                         children = (
                                 BE9185DD05EE59B80081354D,
                                 BE9185E005EE59B80081354D,
+                                BEA5DBDA075CEDA00098A432,
+                                BEA5E01D075CEDAC0098A432,
                                 BE02D4E6066F908A0076809F,
                                 BE02D4E7066F908A0076809F,

trunk/WebCore/khtml/editing/html_interchange.h

@@ -27 +27 @@
 #define KHTML_EDITING_HTML_INTERCHANGE_H
 
+class QString;
+
 #define KHTMLInterchangeNewline   "KHTMLInterchangeNewline"
+#define AppleConvertedSpace       "Apple-converted-space"
 
 enum EAnnotateForInterchange { DoNotAnnotateForInterchange, AnnotateForInterchange };
 
+QString convertHTMLTextToInterchangeFormat(const QString &);
+
 #endif

trunk/WebCore/khtml/editing/htmlediting.cpp

@@ -2700 +2700 @@
 
     NodeImpl *node = firstChild;
-    int blockCount = 0;
+    int realBlockCount = 0;
     NodeImpl *commentToDelete = 0;
     while (node) {
@@ -2708 +2708 @@
             commentToDelete = node;
         }
+        else if (isInterchangeConvertedSpaceSpan(node)) {
+            NodeImpl *n = 0;
+            while ((n = node->firstChild())) {
+                n->ref();
+                removeNode(n);
+                insertNodeBefore(n, node);
+                n->deref();
+            }
+            removeNode(node);
+            if (n)
+                next = n->traverseNextNode();
+        }
         else if (isProbablyBlock(node))
-            blockCount++;    
+            realBlockCount++;    
         node = next;
-     }
-
-     if (commentToDelete)
+    }
+
+    if (commentToDelete)
         removeNode(commentToDelete);
 
+    int blockCount = realBlockCount;
     firstChild = m_fragment->firstChild();
     lastChild = m_fragment->lastChild();
     if (!isProbablyBlock(firstChild))
         blockCount++;
-    if (!isProbablyBlock(lastChild) && firstChild != lastChild)
+    if (!isProbablyBlock(lastChild) && realBlockCount > 0)
         blockCount++;
 
@@ -2802 +2815 @@
 }
 
+bool ReplacementFragment::isInterchangeConvertedSpaceSpan(const NodeImpl *node)
+{
+    static DOMString convertedSpaceSpanClass(AppleConvertedSpace);
+    return node->isHTMLElement() && static_cast<const HTMLElementImpl *>(node)->getAttribute(ATTR_CLASS) == convertedSpaceSpanClass;
+}
+
 void ReplacementFragment::removeNode(NodeImpl *node)
 {
@@ -2814 +2833 @@
     parent->removeChild(node, exceptionCode);
     ASSERT(exceptionCode == 0);
+}
+
+void ReplacementFragment::insertNodeBefore(NodeImpl *node, NodeImpl *refNode)
+{
+    if (!node || !refNode)
+        return;
+        
+    NodeImpl *parent = refNode->parentNode();
+    if (!parent)
+        return;
+        
+    int exceptionCode = 0;
+    parent->insertBefore(node, refNode, exceptionCode);
+    ASSERT(exceptionCode == 0);
  }
+
 
 bool isComment(const NodeImpl *node)
@@ -2845 +2879 @@
         case ID_TD:
         case ID_TH:
-        case ID_TR:
         case ID_UL:
             return true;
@@ -2895 +2928 @@
     
     selection = endingSelection();
-    if (!startAtBlockBoundary || !startPos.node()->inDocument())
+    if (startAtStartOfBlock && startBlock->inDocument())
+        startPos = Position(startBlock, 0);
+    else if (startAtEndOfBlock)
+        startPos = selection.start().downstream(StayInBlock);
+    else
         startPos = selection.start().upstream(upstreamStayInBlock);
     endPos = selection.end().downstream(); 

trunk/WebCore/khtml/editing/htmlediting.h

@@ -515 +515 @@
 
     static bool isInterchangeNewlineComment(const DOM::NodeImpl *);
+    static bool isInterchangeConvertedSpaceSpan(const DOM::NodeImpl *);
+
+    // A couple simple DOM helpers
     void removeNode(DOM::NodeImpl *);
+    void insertNodeBefore(DOM::NodeImpl *node, DOM::NodeImpl *refNode);
 
     EFragmentType m_type;

trunk/WebCore/khtml/xml/dom2_rangeimpl.cpp

@@ -876 +876 @@
         
         // Add the node to the markup.
-        markups.append(n->startMarkup(this));
+        markups.append(n->startMarkup(this, annotate));
         if (nodes) {
             nodes->append(n);
@@ -905 +905 @@
                         if (n != nextParent) {
                             for (NodeImpl *parent = n->parent(); parent != 0 && parent != nextParent; parent = parent->parentNode()) {
-                                markups.prepend(parent->startMarkup(this));
+                                markups.prepend(parent->startMarkup(this, annotate));
                                 markups.append(parent->endMarkup());
                                 if (nodes) {
@@ -934 +934 @@
             }
         }
-        markups.prepend(ancestor->startMarkup(this));
+        markups.prepend(ancestor->startMarkup(this, annotate));
         markups.append(ancestor->endMarkup());
         if (nodes) {
@@ -952 +952 @@
         }
     }
-        
-    return markups.join("");
+    
+    return markups.join("");;
 }
 

trunk/WebCore/khtml/xml/dom_nodeimpl.cpp

@@ -36 +36 @@
 #include "css/csshelper.h"
 #include "css/cssstyleselector.h"
+#include "editing/html_interchange.h"
 #include "editing/selection.h"
 
@@ -297 +298 @@
 }
 
-QString NodeImpl::startMarkup(const RangeImpl *range) const
+QString NodeImpl::stringValueForRange(const RangeImpl *range) const
+{
+    DOMString str = nodeValue().copy();
+    if (range) {
+        int exceptionCode;
+        if (this == range->endContainer(exceptionCode)) {
+            str.truncate(range->endOffset(exceptionCode));
+        }
+        if (this == range->startContainer(exceptionCode)) {
+            str.remove(0, range->startOffset(exceptionCode));
+        }
+    }
+    return str.string();
+}
+
+QString NodeImpl::renderedText(const RangeImpl *range) const
+{
+    QString result;
+
+    RenderObject *r = renderer();
+    if (!r)
+        return result;
+    
+    if (!isTextNode())
+        return result;
+
+    int exceptionCode;
+    const TextImpl *textNode = static_cast<const TextImpl *>(this);
+    unsigned startOffset = 0;
+    unsigned endOffset = textNode->length();
+
+    if (range && this == range->startContainer(exceptionCode))
+        startOffset = range->startOffset(exceptionCode);
+    if (range && this == range->endContainer(exceptionCode))
+        endOffset = range->endOffset(exceptionCode);
+    
+    RenderText *textRenderer = static_cast<RenderText *>(r);
+    QString str = nodeValue().string();
+    for (InlineTextBox *box = textRenderer->firstTextBox(); box; box = box->nextTextBox()) {
+        unsigned start = box->m_start;
+        unsigned end = box->m_start + box->m_len;
+        if (endOffset < start)
+            break;
+        if (startOffset <= end) {
+            unsigned s = kMax(start, startOffset);
+            unsigned e = kMin(end, endOffset);
+            result.append(str.mid(s, e-s));
+        }
+    }
+    
+    return result;
+}
+
+QString NodeImpl::startMarkup(const RangeImpl *range, EAnnotateForInterchange annotate) const
 {
     unsigned short type = nodeType();
     if (type == Node::TEXT_NODE) {
         DOMString str = nodeValue().copy();
-        if (range) {
-            int exceptionCode;
-            if (this == range->endContainer(exceptionCode)) {
-                str.truncate(range->endOffset(exceptionCode));
-            }
-            if (this == range->startContainer(exceptionCode)) {
-                str.remove(0, range->startOffset(exceptionCode));
-            }
-        }
         Id parentID = parentNode()->id();
         bool dontEscape = (parentID == ID_SCRIPT || parentID == ID_TEXTAREA || parentID == ID_STYLE);
-        return dontEscape ? str.string() : escapeHTML(str.string());        
+        if (dontEscape)
+            return stringValueForRange(range);
+        if (annotate)
+            return convertHTMLTextToInterchangeFormat(escapeHTML(renderedText(range))); 
+        return escapeHTML(stringValueForRange(range));
     } else if (type == Node::COMMENT_NODE) {
         return static_cast<const CommentImpl *>(this)->toString().string();

trunk/WebCore/khtml/xml/dom_nodeimpl.h

@@ -29 +29 @@
 #include "dom/dom_string.h"
 #include "dom/dom_node.h"
+#include "editing/html_interchange.h"
 #include "misc/helper.h"
 #include "misc/shared.h"
@@ -261 +262 @@
     
     virtual bool isInline() const;
-    QString startMarkup(const RangeImpl *range) const;
+    QString stringValueForRange(const RangeImpl *range) const;
+    QString renderedText(const RangeImpl *range) const;
+    QString startMarkup(const RangeImpl *range, EAnnotateForInterchange annotate=DoNotAnnotateForInterchange) const;
     QString endMarkup(void) const;
     virtual QString toHTML() const;