[webkit-changes] cvs commit: WebCore/khtml/editing insert_text_command.cpp markup.cpp

[David]

harrison    05/10/31 11:04:43

  Modified:    .        ChangeLog
               khtml/editing insert_text_command.cpp markup.cpp
  Log:
          Remove conditionalized away code added as part of tab character support.
  
          * khtml/editing/insert_text_command.cpp:
          (khtml::InsertTextCommand::prepareForTextInsertion):
          (khtml::InsertTextCommand::insertTab):
          * khtml/editing/markup.cpp:
          (khtml::createParagraphContentsFromString):
  
  Revision  Changes    Path
  1.316     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.315
  retrieving revision 1.316
  diff -u -r1.315 -r1.316
  --- ChangeLog	30 Oct 2005 05:26:22 -0000	1.315
  +++ ChangeLog	31 Oct 2005 19:04:39 -0000	1.316
  @@ -1,3 +1,13 @@
  +2005-10-31  David Harrison  <harrison at apple.com>
  +
  +        Remove conditionalized away code added as part of tab character support.
  +        
  +        * khtml/editing/insert_text_command.cpp:
  +        (khtml::InsertTextCommand::prepareForTextInsertion):
  +        (khtml::InsertTextCommand::insertTab):
  +        * khtml/editing/markup.cpp:
  +        (khtml::createParagraphContentsFromString):
  +
   2005-10-29  David Hyatt  <hyatt at apple.com>
           Fix the performance regression caused by doing too much copying of background/border values.  This patch attempts to rectify things by doing the following:
   
  
  
  
  1.12      +0 -21     WebCore/khtml/editing/insert_text_command.cpp
  
  Index: insert_text_command.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/insert_text_command.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- insert_text_command.cpp	3 Oct 2005 21:12:19 -0000	1.11
  +++ insert_text_command.cpp	31 Oct 2005 19:04:43 -0000	1.12
  @@ -91,14 +91,6 @@
   
       if (isTabSpanTextNode(pos.node())) {
           Position tempPos = pos;
  -//#ifndef COALESCE_TAB_SPANS
  -#if 0
  -        NodeImpl *node = pos.node()->parentNode();
  -        if (pos.offset() > pos.node()->caretMinOffset())
  -            tempPos = Position(node->parentNode(), node->nodeIndex() + 1);
  -        else
  -            tempPos = Position(node->parentNode(), node->nodeIndex());
  -#endif        
           NodeImpl *textNode = document()->createEditingTextNode("");
           NodeImpl *originalTabSpan = tempPos.node()->parent();
           if (tempPos.offset() <= tempPos.node()->caretMinOffset()) {
  @@ -188,24 +180,11 @@
       NodeImpl *node = insertPos.node();
       unsigned int offset = insertPos.offset();
   
  -//#ifdef COALESCE_TAB_SPANS
  -#if 1
       // keep tabs coalesced in tab span
       if (isTabSpanTextNode(node)) {
           insertTextIntoNode(static_cast<TextImpl *>(node), offset, "\t");
           return Position(node, offset + 1);
       }
  -#else
  -    if (isTabSpanTextNode(node)) {
  -        node = node->parentNode();
  -        if (offset > (unsigned int) node->caretMinOffset())
  -            insertPos = Position(node->parentNode(), node->nodeIndex() + 1);
  -        else
  -            insertPos = Position(node->parentNode(), node->nodeIndex());
  -        node = insertPos.node();
  -        offset = insertPos.offset();
  -    }
  -#endif
       
       // create new tab span
       DOM::ElementImpl * spanNode = createTabSpanElement(document());
  
  
  
  1.39      +0 -6      WebCore/khtml/editing/markup.cpp
  
  Index: markup.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- markup.cpp	27 Oct 2005 06:03:29 -0000	1.38
  +++ markup.cpp	31 Oct 2005 19:04:43 -0000	1.39
  @@ -554,13 +554,7 @@
           // there is a tab after every entry, except the last entry
           // (if the last character is a tab, the list gets an extra empty entry)
           if (!tabList.isEmpty()) {
  -//#ifdef COALESCE_TAB_SPANS
  -#if 1
               tabText += '\t';
  -#else
  -            paragraph->appendChild(createTabSpanElement(document), exceptionCode);
  -            ASSERT(exceptionCode == 0);
  -#endif
           } else if (tabText != "") {
               paragraph->appendChild(createTabSpanElement(document, &tabText), exceptionCode);
               ASSERT(exceptionCode == 0);