[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 1fe41b68c1aa5cc1ac9f4f07e0c1948ca1218c1a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 25 23:05:45 2004 +0000

    WebCore:
    
    	Fixed regression where undoing typing would undo character-by-character.
    
            Reviewed by kocienda.
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge insertText:]): new, this method used to be replaceSelectionWithText, but replaceSelectionWithText now is one operation whereas calls to insertText: are coalesced
    
    WebKit:
    
    	Fixed regression where undoing typing would undo character-by-character.
    
            Reviewed by kocienda.
    
            * WebView.subproj/WebView.m:
            (-[WebView insertText:]): call insertText: rather than replaceSelectionWithText:: since text insertion via insertText: is coalesced and this is the behavior we want here
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6688 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c870021..53d2037 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-05-25  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed regression where undoing typing would undo character-by-character.
+
+        Reviewed by kocienda.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge insertText:]): new, this method used to be replaceSelectionWithText, but replaceSelectionWithText now is one operation whereas calls to insertText: are coalesced
+
 2004-05-25  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index c7658ed..df6aece 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -297,6 +297,8 @@ typedef enum {
 - (void)replaceSelectionWithText:(NSString *)text selectReplacement:(BOOL)selectReplacement;
 - (void)replaceSelectionWithNewline;
 
+- (void)insertText:(NSString *)text;
+
 - (void)setSelectionToDragCaret;
 - (void)moveSelectionToDragCaret:(DOMDocumentFragment *)selectionFragment;
 - (void)moveDragCaretToPoint:(NSPoint)point;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 727c9dd..04839e5 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1453,6 +1453,14 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
     TypingCommand::insertNewline(_part->xmlDocImpl());
 }
 
+- (void)insertText:(NSString *)text
+{
+    if (!_part || !_part->xmlDocImpl())
+        return;
+    
+    TypingCommand::insertText(_part->xmlDocImpl(), text);
+}
+
 - (void)setSelectionToDragCaret
 {
     _part->setSelection(_part->dragCaret());
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7a26db5..d938693 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-25  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed regression where undoing typing would undo character-by-character.
+
+        Reviewed by kocienda.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView insertText:]): call insertText: rather than replaceSelectionWithText:: since text insertion via insertText: is coalesced and this is the behavior we want here
+
 2004-05-25  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 61fb0ab..84ca1e6 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -3365,7 +3365,7 @@ static NSFont *_fontFromStyle(DOMCSSStyleDeclaration *style)
     if ([self _currentSelectionIsEditable]) {
         if ([[self _editingDelegateForwarder] webView:self shouldInsertText:text replacingDOMRange:[self selectedDOMRange] givenAction:WebViewInsertActionTyped]) {
             WebBridge *bridge = [self _bridgeForCurrentSelection];
-            [bridge replaceSelectionWithText:text selectReplacement:NO];
+            [bridge insertText:text];
             [bridge ensureCaretVisible];
         }
         return;

-- 
WebKit Debian packaging