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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 21af973a92d9c5c7297f7bdcf12fa663dda862d0
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 10 23:21:17 2004 +0000

            Reviewed by Ken.
    
    	- avoid messing with undo manager needlessly for ~1% HTML iBench speedup
    
            * WebCoreSupport.subproj/WebBridge.h:
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge registerCommandForUndo:]): mark undo/redo item flag
            (-[WebBridge registerCommandForRedo:]): ditto
            (-[WebBridge clearUndoRedoOperations]): check flag before removing items,
    	and clear it after removing them
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dced1ca..9ce6f3d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Ken.
+
+	- avoid messing with undo manager needlessly for ~1% HTML iBench speedup
+
+        * WebCoreSupport.subproj/WebBridge.h:
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge registerCommandForUndo:]): mark undo/redo item flag
+        (-[WebBridge registerCommandForRedo:]): ditto
+        (-[WebBridge clearUndoRedoOperations]): check flag before removing items,
+	and clear it after removing them
+
 2004-05-08  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.h b/WebKit/WebCoreSupport.subproj/WebBridge.h
index d0d10e2..c6dd7e7 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.h
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.h
@@ -19,6 +19,7 @@
     BOOL _keyboardUIModeAccessed;
     BOOL _doingClientRedirect;
     BOOL _inNextKeyViewOutsideWebFrameViews;
+    BOOL _haveUndoRedoOperations;
 }
 
 - (id)initWithWebFrame:(WebFrame *)webFrame;
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 63fea61..5a7382c 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1183,18 +1183,23 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
 {
     NSUndoManager *undoManager = [[_frame webView] undoManager];
     [undoManager registerUndoWithTarget:self selector:@selector(undoEditing:) object:arg];
+    _haveUndoRedoOperations = YES;
 }
 
 - (void)registerCommandForRedo:(id)arg
 {
     NSUndoManager *undoManager = [[_frame webView] undoManager];
     [undoManager registerUndoWithTarget:self selector:@selector(redoEditing:) object:arg];
+    _haveUndoRedoOperations = YES;
 }
 
 - (void)clearUndoRedoOperations
 {
-    NSUndoManager *undoManager = [[_frame webView] undoManager];
-    [undoManager removeAllActionsWithTarget:self];
+    if (_haveUndoRedoOperations) {
+	NSUndoManager *undoManager = [[_frame webView] undoManager];
+	[undoManager removeAllActionsWithTarget:self];
+	_haveUndoRedoOperations = NO;
+    }
 }
 
 - (void)editingKeyDown:(NSEvent *)event

-- 
WebKit Debian packaging