[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 57662911d2823531ac02e63f777e7dba2da7f6ec
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 00:14:17 2010 +0000

    2010-09-28  Jia Pu  <jpu at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Delete and forward delete shouldn't start autocorrection panel timer.
            https://bugs.webkit.org/show_bug.cgi?id=46679
            <rdar://problem/8463917>
    
            * editing/TypingCommand.cpp:
            (WebCore::TypingCommand::markMisspellingsAfterTyping): Only start correction panel timer
              when the editing command is InsertText.
            (WebCore::TypingCommand::typingAddedToOpenCommand): Add an argument to pass in command type.
    
            * editing/TypingCommand.h: Add an argument to typingAddedToOpenCommand().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 65eb364..56708ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-28  Jia Pu  <jpu at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Delete and forward delete shouldn't start autocorrection panel timer.
+        https://bugs.webkit.org/show_bug.cgi?id=46679
+        <rdar://problem/8463917>
+
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::markMisspellingsAfterTyping): Only start correction panel timer
+          when the editing command is InsertText.
+        (WebCore::TypingCommand::typingAddedToOpenCommand): Add an argument to pass in command type.
+
+        * editing/TypingCommand.h: Add an argument to typingAddedToOpenCommand().
+
 2010-09-28  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/editing/TypingCommand.cpp b/WebCore/editing/TypingCommand.cpp
index 1d1183a..60b3f7b 100644
--- a/WebCore/editing/TypingCommand.cpp
+++ b/WebCore/editing/TypingCommand.cpp
@@ -283,7 +283,7 @@ EditAction TypingCommand::editingAction() const
     return EditActionTyping;
 }
 
-void TypingCommand::markMisspellingsAfterTyping()
+void TypingCommand::markMisspellingsAfterTyping(ETypingCommand commandType)
 {
 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     if (!document()->frame()->editor()->isContinuousSpellCheckingEnabled()
@@ -308,8 +308,10 @@ void TypingCommand::markMisspellingsAfterTyping()
         if (p1 != p2)
             document()->frame()->editor()->markMisspellingsAfterTypingToPosition(p1);
 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-        else
+        else if (commandType == TypingCommand::InsertText)
             document()->frame()->editor()->startCorrectionPanelTimer();
+#else
+    UNUSED_PARAM(commandType);
 #endif
     }
 }
@@ -317,14 +319,14 @@ void TypingCommand::markMisspellingsAfterTyping()
 void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping)
 {
     updatePreservesTypingStyle(commandTypeForAddedTyping);
-    
+
 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
     document()->frame()->editor()->appliedEditing(this);
     // Since the spellchecking code may also perform corrections and other replacements, it should happen after the typing changes.
-    markMisspellingsAfterTyping();
+    markMisspellingsAfterTyping(commandTypeForAddedTyping);
 #else
     // The old spellchecking code requires that checking be done first, to prevent issues like that in 6864072, where <doesn't> is marked as misspelled.
-    markMisspellingsAfterTyping();
+    markMisspellingsAfterTyping(commandTypeForAddedTyping);
     document()->frame()->editor()->appliedEditing(this);
 #endif
 }
diff --git a/WebCore/editing/TypingCommand.h b/WebCore/editing/TypingCommand.h
index 7c89a7c..60b5f2a 100644
--- a/WebCore/editing/TypingCommand.h
+++ b/WebCore/editing/TypingCommand.h
@@ -82,10 +82,10 @@ private:
     virtual bool preservesTypingStyle() const { return m_preservesTypingStyle; }
 
     void updatePreservesTypingStyle(ETypingCommand);
-    void markMisspellingsAfterTyping();
+    void markMisspellingsAfterTyping(ETypingCommand);
     void typingAddedToOpenCommand(ETypingCommand);
     bool makeEditableRootEmpty();
-    
+
     ETypingCommand m_commandType;
     String m_textToInsert;
     bool m_openForMoreTyping;

-- 
WebKit Debian packaging