Unreviewed, rolling out r150034.

http://trac.webkit.org/changeset/150034
https://bugs.webkit.org/show_bug.cgi?id=116257

This work around doesn't work due to another bug NSUndoManager
has (Requested by rniwa on #webkit).

Patch by Commit Queue <commit-queue@webkit.org> on 2013-05-16

Source/WebKit/mac:

* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::registerUndoOrRedoStep):

Source/WebKit2:

* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::registerEditCommand):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 074d150b3ea8b0aff58a21ec0bc2fab0c331bf29..39e890763aad427767948532e3897395171a513b 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-16  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r150034.
+        http://trac.webkit.org/changeset/150034
+        https://bugs.webkit.org/show_bug.cgi?id=116257
+
+        This work around doesn't work due to another bug NSUndoManager
+        has (Requested by rniwa on #webkit).
+
+        * WebCoreSupport/WebEditorClient.mm:
+        (WebEditorClient::registerUndoOrRedoStep):
+

 2013-05-16  Tim Horton  <timothy_horton@apple.com>
 
         PDFPlugins don't load when plugins are disabled, but they should
 2013-05-16  Tim Horton  <timothy_horton@apple.com>
 
         PDFPlugins don't load when plugins are disabled, but they should

diff --git a/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm b/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
index 099d2e7b15137b25ac5e2000e43b48080a530741..2045d8eaf732fd2c064fdb1c653b4049591cd017 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
@@ -544,11 +544,9 @@ void WebEditorClient::registerUndoOrRedoStep(PassRefPtr<UndoStep> step, bool isR
     NSUndoManager *undoManager = [m_webView undoManager];
     NSString *actionName = undoNameForEditAction(step->editingAction());
     WebUndoStep *webEntry = [WebUndoStep stepWithUndoStep:step];
     NSUndoManager *undoManager = [m_webView undoManager];
     NSString *actionName = undoNameForEditAction(step->editingAction());
     WebUndoStep *webEntry = [WebUndoStep stepWithUndoStep:step];

-    [undoManager beginUndoGrouping];

     [undoManager registerUndoWithTarget:m_undoTarget.get() selector:(isRedo ? @selector(redoEditing:) : @selector(undoEditing:)) object:webEntry];
     if (actionName)
         [undoManager setActionName:actionName];
     [undoManager registerUndoWithTarget:m_undoTarget.get() selector:(isRedo ? @selector(redoEditing:) : @selector(undoEditing:)) object:webEntry];
     if (actionName)
         [undoManager setActionName:actionName];

-    [undoManager endUndoGrouping];

     m_haveUndoRedoOperations = YES;
 }
 
     m_haveUndoRedoOperations = YES;
 }
 

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index dc936e569f7b05150587b9042f6280eeb3e50ed5..20ca377379627df053e491ef0158ea617cb5a37b 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-16  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r150034.
+        http://trac.webkit.org/changeset/150034
+        https://bugs.webkit.org/show_bug.cgi?id=116257
+
+        This work around doesn't work due to another bug NSUndoManager
+        has (Requested by rniwa on #webkit).
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::registerEditCommand):
+

 2013-05-16  Tim Horton  <timothy_horton@apple.com>
 
         PDFPlugins don't load when plugins are disabled, but they should
 2013-05-16  Tim Horton  <timothy_horton@apple.com>
 
         PDFPlugins don't load when plugins are disabled, but they should

diff --git a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 447cd907a88fbf5d6c3a4c6ab47a9a3815c80d76..28bf8218bf0da37e9216f9493031f90e211c58d6 100644 (file)
--- a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -286,11 +286,9 @@ void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy> prpComm
     String actionName = WebEditCommandProxy::nameForEditAction(command->editAction());
 
     NSUndoManager *undoManager = [m_wkView undoManager];
     String actionName = WebEditCommandProxy::nameForEditAction(command->editAction());
 
     NSUndoManager *undoManager = [m_wkView undoManager];

-    [undoManager beginUndoGrouping];

     [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
     if (!actionName.isEmpty())
         [undoManager setActionName:(NSString *)actionName];
     [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
     if (!actionName.isEmpty())
         [undoManager setActionName:(NSString *)actionName];

-    [undoManager endUndoGrouping];

 }
 
 void PageClientImpl::clearAllEditCommands()
 }
 
 void PageClientImpl::clearAllEditCommands()