[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d61c6e5973f920d966b98704b8ab92caf04f3a47
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 00:09:14 2011 +0000

    2011-01-03  Darin Adler  <darin at apple.com>
    
            Reviewed by Dan Bernstein.
    
            InsertTextCommand::m_charactersAdded is unused
            https://bugs.webkit.org/show_bug.cgi?id=51849
    
            * editing/InsertTextCommand.cpp:
            (WebCore::InsertTextCommand::InsertTextCommand): Don't initialize m_charactersAdded.
            (WebCore::InsertTextCommand::input): Don't update m_charactersAdded.
            * editing/InsertTextCommand.h: Removed charactersAdded function and
            m_charactersAdded data member.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 92f7b38..6d96f4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        InsertTextCommand::m_charactersAdded is unused
+        https://bugs.webkit.org/show_bug.cgi?id=51849
+
+        * editing/InsertTextCommand.cpp:
+        (WebCore::InsertTextCommand::InsertTextCommand): Don't initialize m_charactersAdded.
+        (WebCore::InsertTextCommand::input): Don't update m_charactersAdded.
+        * editing/InsertTextCommand.h: Removed charactersAdded function and
+        m_charactersAdded data member.
+
 2011-01-03  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/editing/InsertTextCommand.cpp b/WebCore/editing/InsertTextCommand.cpp
index 0462cfb..fc18e91 100644
--- a/WebCore/editing/InsertTextCommand.cpp
+++ b/WebCore/editing/InsertTextCommand.cpp
@@ -45,7 +45,7 @@
 namespace WebCore {
 
 InsertTextCommand::InsertTextCommand(Document *document) 
-    : CompositeEditCommand(document), m_charactersAdded(0)
+    : CompositeEditCommand(document)
 {
 }
 
@@ -161,7 +161,6 @@ void InsertTextCommand::input(const String& text, bool selectInsertedText)
         startPosition = endPosition.previous();
         if (placeholder.isNotNull())
             removePlaceholderAt(placeholder);
-        m_charactersAdded += 1;
     } else {
         // Make sure the document is set up to receive text
         startPosition = prepareForTextInsertion(startPosition);
@@ -178,8 +177,6 @@ void InsertTextCommand::input(const String& text, bool selectInsertedText)
         // Rebalancing on both sides isn't necessary if we've inserted a space.
         if (text != " ") 
             rebalanceWhitespaceAt(startPosition);
-            
-        m_charactersAdded += text.length();
     }
 
     // We could have inserted a part of composed character sequence,
diff --git a/WebCore/editing/InsertTextCommand.h b/WebCore/editing/InsertTextCommand.h
index 24c2454..77ae016 100644
--- a/WebCore/editing/InsertTextCommand.h
+++ b/WebCore/editing/InsertTextCommand.h
@@ -43,7 +43,6 @@ private:
     InsertTextCommand(Document*);
 
     void deleteCharacter();
-    unsigned charactersAdded() const { return m_charactersAdded; }
     
     virtual void doApply();
     virtual bool isInsertTextCommand() const;
@@ -53,8 +52,6 @@ private:
     
     bool performTrivialReplace(const String&, bool selectInsertedText);
 
-    unsigned m_charactersAdded;
-
     friend class TypingCommand;
 };
 

-- 
WebKit Debian packaging