Title: [159046] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 159046
- Author
- [email protected]
- Date
- 2013-11-11 02:07:25 -0800 (Mon, 11 Nov 2013)
Log Message
Merge r156892 - [GTK] Enable text edition UndoOperations support in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=122305
Patch by Lorenzo Tilve <[email protected]> on 2013-10-04
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
Replaced the notImplemented() function calls for
the corresponding implementation of the edit operations
provided by the DefaultUndoController class.
* GNUmakefile.list.am:
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::registerEditCommand):
(WebKit::PageClientImpl::clearAllEditCommands):
(WebKit::PageClientImpl::canUndoRedo):
(WebKit::PageClientImpl::executeUndoRedo):
* UIProcess/API/gtk/PageClientImpl.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (159045 => 159046)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-11-11 09:52:25 UTC (rev 159045)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2013-11-11 10:07:25 UTC (rev 159046)
@@ -1,3 +1,22 @@
+2013-10-04 Lorenzo Tilve <[email protected]>
+
+ [GTK] Enable text edition UndoOperations support in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=122305
+
+ Reviewed by Carlos Garcia Campos.
+
+ Replaced the notImplemented() function calls for
+ the corresponding implementation of the edit operations
+ provided by the DefaultUndoController class.
+
+ * GNUmakefile.list.am:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::registerEditCommand):
+ (WebKit::PageClientImpl::clearAllEditCommands):
+ (WebKit::PageClientImpl::canUndoRedo):
+ (WebKit::PageClientImpl::executeUndoRedo):
+ * UIProcess/API/gtk/PageClientImpl.h:
+
2013-11-01 Emilio Pozuelo Monfort <[email protected]>
Fix build on non-linux platforms
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/GNUmakefile.list.am (159045 => 159046)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/GNUmakefile.list.am 2013-11-11 09:52:25 UTC (rev 159045)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/GNUmakefile.list.am 2013-11-11 10:07:25 UTC (rev 159046)
@@ -806,6 +806,8 @@
Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h \
Source/WebKit2/UIProcess/BackingStore.cpp \
Source/WebKit2/UIProcess/BackingStore.h \
+ Source/WebKit2/UIProcess/DefaultUndoController.cpp \
+ Source/WebKit2/UIProcess/DefaultUndoController.h \
Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp \
Source/WebKit2/UIProcess/Downloads/DownloadProxy.h \
Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp \
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (159045 => 159046)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2013-11-11 09:52:25 UTC (rev 159045)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2013-11-11 10:07:25 UTC (rev 159046)
@@ -162,25 +162,24 @@
notImplemented();
}
-void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo)
+void PageClientImpl::registerEditCommand(PassRefPtr<WebEditCommandProxy> command, WebPageProxy::UndoOrRedo undoOrRedo)
{
- notImplemented();
+ m_undoController.registerEditCommand(command, undoOrRedo);
}
void PageClientImpl::clearAllEditCommands()
{
- notImplemented();
+ m_undoController.clearAllEditCommands();
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo)
+bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
{
- notImplemented();
- return false;
+ return m_undoController.canUndoRedo(undoOrRedo);
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo)
+void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
{
- notImplemented();
+ m_undoController.executeUndoRedo(undoOrRedo);
}
FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& viewRect)
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (159045 => 159046)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2013-11-11 09:52:25 UTC (rev 159045)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2013-11-11 10:07:25 UTC (rev 159046)
@@ -28,6 +28,7 @@
#ifndef PageClientImpl_h
#define PageClientImpl_h
+#include "DefaultUndoController.h"
#include "KeyBindingTranslator.h"
#include "PageClient.h"
#include "WebPageProxy.h"
@@ -102,6 +103,7 @@
// Members of PageClientImpl class
GtkWidget* m_viewWidget;
+ DefaultUndoController m_undoController;
WebCore::KeyBindingTranslator m_keyBindingTranslator;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
