Changeset 45080 in webkit

Timestamp:

Jun 24, 2009 7:02:16 AM (15 years ago)

Author:

zecke@webkit.org

Message:

2009-06-24 Jiahua Huang <​jhuangjiahua@gmail.com>

Reviewed by Holger Freyther.

[Gtk] Add Undo/Redo support to WebKitGtk
​https://bugs.webkit.org/show_bug.cgi?id=26573

Implement EditorClient::undo and other interested funcs.

• WebCoreSupport/EditorClientGtk.cpp: (WebKit::EditorClient::registerCommandForUndo): (WebKit::EditorClient::registerCommandForRedo): (WebKit::EditorClient::clearUndoRedoOperations): (WebKit::EditorClient::canUndo): (WebKit::EditorClient::canRedo): (WebKit::EditorClient::undo): (WebKit::EditorClient::redo): (WebKit::EditorClient::EditorClient):
• WebCoreSupport/EditorClientGtk.h:

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/EditorClientGtk.cpp (modified) (3 diffs)
• WebCoreSupport/EditorClientGtk.h (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-06-24  Jiahua Huang  <jhuangjiahua@gmail.com>
+
+        Reviewed by Holger Freyther.
+
+        [Gtk] Add Undo/Redo support to WebKitGtk
+        https://bugs.webkit.org/show_bug.cgi?id=26573
+
+        Implement EditorClient::undo and other interested funcs.
+
+        * WebCoreSupport/EditorClientGtk.cpp:
+        (WebKit::EditorClient::registerCommandForUndo):
+        (WebKit::EditorClient::registerCommandForRedo):
+        (WebKit::EditorClient::clearUndoRedoOperations):
+        (WebKit::EditorClient::canUndo):
+        (WebKit::EditorClient::canRedo):
+        (WebKit::EditorClient::undo):
+        (WebKit::EditorClient::redo):
+        (WebKit::EditorClient::EditorClient):
+        * WebCoreSupport/EditorClientGtk.h:
+
 2009-06-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

@@ -40 +40 @@
 #include "webkitprivate.h"
 
+// Arbitrary depth limit for the undo stack, to keep it from using
+// unbounded memory.  This is the maximum number of distinct undoable
+// actions -- unbroken stretches of typed characters are coalesced
+// into a single action.
+#define maximumUndoStackDepth 1000
+
 using namespace WebCore;
 
@@ -254 +260 @@
 }
 
-void EditorClient::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand>)
-{
-    notImplemented();
-}
-
-void EditorClient::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand>)
-{
-    notImplemented();
+void EditorClient::registerCommandForUndo(WTF::PassRefPtr<WebCore::EditCommand> command)
+{
+    if (undoStack.size() == maximumUndoStackDepth)
+        undoStack.removeFirst();
+    if (!m_isInRedo)
+        redoStack.clear();
+    undoStack.append(command);
+}
+
+void EditorClient::registerCommandForRedo(WTF::PassRefPtr<WebCore::EditCommand> command)
+{
+    redoStack.append(command);
 }
 
 void EditorClient::clearUndoRedoOperations()
 {
-    notImplemented();
+    undoStack.clear();
+    redoStack.clear();
 }
 
 bool EditorClient::canUndo() const
 {
-    notImplemented();
-    return false;
+    return !undoStack.isEmpty();
 }
 
 bool EditorClient::canRedo() const
 {
-    notImplemented();
-    return false;
+    return !redoStack.isEmpty();
 }
 
 void EditorClient::undo()
 {
-    notImplemented();
+    if (canUndo()) {
+        RefPtr<WebCore::EditCommand> command(*(--undoStack.end()));
+        undoStack.remove(--undoStack.end());
+        // unapply will call us back to push this command onto the redo stack.
+        command->unapply();
+    }
 }
 
 void EditorClient::redo()
 {
-    notImplemented();
+    if (canRedo()) {
+        RefPtr<WebCore::EditCommand> command(*(--redoStack.end()));
+        redoStack.remove(--redoStack.end());
+
+        ASSERT(!m_isInRedo);
+        m_isInRedo = true;
+        // reapply will call us back to push this command onto the undo stack.
+        command->reapply();
+        m_isInRedo = false;
+    }
 }
 
@@ -522 +545 @@
 
 EditorClient::EditorClient(WebKitWebView* webView)
-    : m_webView(webView)
+    : m_isInRedo(false)
+    , m_webView(webView)
 {
     WebKitWebViewPrivate* priv = m_webView->priv;

trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.h

@@ -33 +33 @@
 #include "EditorClient.h"
 
+#include <wtf/Deque.h>
 #include <wtf/Forward.h>
 
@@ -44 +45 @@
 
     class EditorClient : public WebCore::EditorClient {
+    protected:
+        bool m_isInRedo;
+
+        WTF::Deque<WTF::RefPtr<WebCore::EditCommand> > undoStack;
+        WTF::Deque<WTF::RefPtr<WebCore::EditCommand> > redoStack;
+
     public:
         EditorClient(WebKitWebView*);