Diff
Modified: trunk/Source/WebCore/ChangeLog (234332 => 234333)
--- trunk/Source/WebCore/ChangeLog 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebCore/ChangeLog 2018-07-27 22:32:25 UTC (rev 234333)
@@ -1,5 +1,14 @@
2018-07-27 Alex Christensen <[email protected]>
+ Don't include WebPageProxy.h just for UndoOrRedo
+ https://bugs.webkit.org/show_bug.cgi?id=188086
+
+ Reviewed by Saam Barati.
+
+ * platform/DragItem.h:
+
+2018-07-27 Alex Christensen <[email protected]>
+
Make CompletionHandler more const correct
https://bugs.webkit.org/show_bug.cgi?id=186543
Modified: trunk/Source/WebCore/platform/DragItem.h (234332 => 234333)
--- trunk/Source/WebCore/platform/DragItem.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebCore/platform/DragItem.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -25,6 +25,7 @@
#pragma once
+#include "DragActions.h"
#include "DragImage.h"
#include "FloatPoint.h"
#include "IntPoint.h"
Modified: trunk/Source/WebKit/ChangeLog (234332 => 234333)
--- trunk/Source/WebKit/ChangeLog 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/ChangeLog 2018-07-27 22:32:25 UTC (rev 234333)
@@ -1,5 +1,46 @@
2018-07-27 Alex Christensen <[email protected]>
+ Don't include WebPageProxy.h just for UndoOrRedo
+ https://bugs.webkit.org/show_bug.cgi?id=188086
+
+ Reviewed by Saam Barati.
+
+ * Shared/UndoOrRedo.h: Added.
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::registerEditCommand):
+ * UIProcess/PageClient.h:
+ * UIProcess/WebEditCommandProxy.cpp:
+ (WebKit::WebEditCommandProxy::unapply):
+ (WebKit::WebEditCommandProxy::reapply):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::registerEditCommandForUndo):
+ (WebKit::WebPageProxy::canUndoRedo):
+ (WebKit::WebPageProxy::executeUndoRedo):
+ (WebKit::WebPageProxy::canUndo):
+ (WebKit::WebPageProxy::canRedo):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::registerEditCommand):
+ (WebKit::PageClientImpl::canUndoRedo):
+ (WebKit::PageClientImpl::executeUndoRedo):
+ * UIProcess/mac/PageClientImplMac.h:
+ * UIProcess/mac/PageClientImplMac.mm:
+ (WebKit::PageClientImpl::registerEditCommand):
+ (WebKit::PageClientImpl::canUndoRedo):
+ (WebKit::PageClientImpl::executeUndoRedo):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::canUndo const):
+ (WebKit::WebEditorClient::canRedo const):
+ (WebKit::WebEditorClient::undo):
+ (WebKit::WebEditorClient::redo):
+
+2018-07-27 Alex Christensen <[email protected]>
+
Make CompletionHandler more const correct
https://bugs.webkit.org/show_bug.cgi?id=186543
Added: trunk/Source/WebKit/Shared/UndoOrRedo.h (0 => 234333)
--- trunk/Source/WebKit/Shared/UndoOrRedo.h (rev 0)
+++ trunk/Source/WebKit/Shared/UndoOrRedo.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <wtf/EnumTraits.h>
+
+namespace WebKit {
+
+enum class UndoOrRedo { Undo, Redo };
+
+}
+
+namespace WTF {
+
+template<> struct EnumTraits<WebKit::UndoOrRedo> {
+ using values = EnumValues<
+ WebKit::UndoOrRedo,
+ WebKit::UndoOrRedo::Undo,
+ WebKit::UndoOrRedo::Redo
+ >;
+};
+
+}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -148,7 +148,7 @@
notImplemented();
}
-void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
m_undoController.registerEditCommand(WTFMove(command), undoOrRedo);
}
@@ -158,12 +158,12 @@
m_undoController.clearAllEditCommands();
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+bool PageClientImpl::canUndoRedo(UndoOrRedo undoOrRedo)
{
return m_undoController.canUndoRedo(undoOrRedo);
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::executeUndoRedo(UndoOrRedo undoOrRedo)
{
m_undoController.executeUndoRedo(undoOrRedo);
}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -41,6 +41,8 @@
class DrawingAreaProxy;
class WebPageNamespace;
+enum class UndoOrRedo;
+
class PageClientImpl : public PageClient
#if ENABLE(FULLSCREEN_API)
, public WebFullScreenManagerProxyClient
@@ -72,10 +74,10 @@
void setCursor(const WebCore::Cursor&) override;
void setCursorHiddenUntilMouseMoves(bool) override;
void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) override;
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) override;
void clearAllEditCommands() override;
- bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
- void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ bool canUndoRedo(UndoOrRedo) override;
+ void executeUndoRedo(UndoOrRedo) override;
WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
Modified: trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -135,7 +135,7 @@
{
}
-void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo)
+void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo)
{
}
@@ -143,12 +143,12 @@
{
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo)
+bool PageClientImpl::canUndoRedo(UndoOrRedo)
{
return false;
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo)
+void PageClientImpl::executeUndoRedo(UndoOrRedo)
{
}
Modified: trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -36,6 +36,8 @@
class ScrollGestureController;
+enum class UndoOrRedo;
+
class PageClientImpl final : public PageClient
#if ENABLE(FULLSCREEN_API)
, public WebFullScreenManagerProxyClient
@@ -72,10 +74,10 @@
void setCursorHiddenUntilMouseMoves(bool) override;
void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) override;
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) override;
void clearAllEditCommands() override;
- bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
- void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ bool canUndoRedo(UndoOrRedo) override;
+ void executeUndoRedo(UndoOrRedo) override;
WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -28,10 +28,11 @@
#if PLATFORM(MAC)
#include "PluginComplexTextInputState.h"
+#include "ShareableBitmap.h"
#include "WKDragDestinationAction.h"
#include "WKLayoutMode.h"
-#include "WebPageProxy.h"
#include "_WKOverlayScrollbarStyle.h"
+#include <WebCore/ScrollTypes.h>
#include <WebCore/TextIndicatorWindow.h>
#include <WebCore/UserInterfaceLayoutDirection.h>
#include <pal/spi/cocoa/AVKitSPI.h>
@@ -55,6 +56,7 @@
OBJC_CLASS WKViewLayoutStrategy;
OBJC_CLASS WKWebView;
OBJC_CLASS WKWindowVisibilityObserver;
+OBJC_CLASS _WKRemoteObjectRegistry;
OBJC_CLASS _WKThumbnailView;
#if HAVE(TOUCH_BAR)
@@ -67,6 +69,12 @@
OBJC_CLASS WebPlaybackControlsManager;
#endif // HAVE(TOUCH_BAR)
+namespace API {
+class HitTestResult;
+class Object;
+class PageConfiguration;
+}
+
@protocol WebViewImplDelegate
- (NSTextInputContext *)_web_superInputContext;
@@ -108,17 +116,24 @@
namespace WebCore {
struct DragItem;
-struct KeyPressCommand;
+struct KeypressCommand;
}
namespace WebKit {
+class PageClient;
class PageClientImpl;
class DrawingAreaProxy;
class ViewGestureController;
+class ViewSnapshot;
+class WebBackForwardListItem;
class WebEditCommandProxy;
+class WebFrameProxy;
class WebPageProxy;
+class WebProcessPool;
struct ColorSpaceData;
+struct WebHitTestResultData;
+enum class UndoOrRedo;
typedef id <NSValidatedUserInterfaceItem> ValidationItem;
typedef Vector<RetainPtr<ValidationItem>> ValidationVector;
@@ -290,7 +305,7 @@
bool isEditable() const;
bool executeSavedCommandBySelector(SEL);
void executeEditCommandForSelector(SEL, const String& argument = String());
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo);
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo);
void clearAllEditCommands();
bool writeSelectionToPasteboard(NSPasteboard *, NSArray *types);
bool readSelectionFromPasteboard(NSPasteboard *);
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-07-27 22:32:25 UTC (rev 234333)
@@ -51,6 +51,7 @@
#import "TextCheckerState.h"
#import "TiledCoreAnimationDrawingAreaProxy.h"
#import "UIGamepadProvider.h"
+#import "UndoOrRedo.h"
#import "ViewGestureController.h"
#import "WKBrowsingContextControllerInternal.h"
#import "WKFullScreenWindowController.h"
@@ -2570,13 +2571,13 @@
m_page->executeEditCommand(commandNameForSelector(selector), argument);
}
-void WebViewImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void WebViewImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
RetainPtr<WKEditCommandObjC> commandObjC = adoptNS([[WKEditCommandObjC alloc] initWithWebEditCommandProxy:command.ptr()]);
String actionName = WebEditCommandProxy::nameForEditAction(command->editAction());
NSUndoManager *undoManager = [m_view undoManager];
- [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
+ [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == UndoOrRedo::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
if (!actionName.isEmpty())
[undoManager setActionName:(NSString *)actionName];
}
Modified: trunk/Source/WebKit/UIProcess/DefaultUndoController.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/DefaultUndoController.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/DefaultUndoController.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -22,14 +22,15 @@
#include "config.h"
#include "DefaultUndoController.h"
+#include "UndoOrRedo.h"
#include "WebEditCommandProxy.h"
#include <wtf/RefPtr.h>
namespace WebKit {
-void DefaultUndoController::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void DefaultUndoController::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
- if (undoOrRedo == WebPageProxy::Undo)
+ if (undoOrRedo == UndoOrRedo::Undo)
m_undoStack.append(WTFMove(command));
else
m_redoStack.append(WTFMove(command));
@@ -41,18 +42,18 @@
m_redoStack.clear();
}
-bool DefaultUndoController::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+bool DefaultUndoController::canUndoRedo(UndoOrRedo undoOrRedo)
{
- if (undoOrRedo == WebPageProxy::Undo)
+ if (undoOrRedo == UndoOrRedo::Undo)
return !m_undoStack.isEmpty();
return !m_redoStack.isEmpty();
}
-void DefaultUndoController::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+void DefaultUndoController::executeUndoRedo(UndoOrRedo undoOrRedo)
{
RefPtr<WebEditCommandProxy> command;
- if (undoOrRedo == WebPageProxy::Undo) {
+ if (undoOrRedo == UndoOrRedo::Undo) {
command = m_undoStack.last();
m_undoStack.removeLast();
command->unapply();
Modified: trunk/Source/WebKit/UIProcess/DefaultUndoController.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/DefaultUndoController.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/DefaultUndoController.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -19,8 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef DefaultUndoController_h
-#define DefaultUndoController_h
+#pragma once
#include "WebEditCommandProxy.h"
#include "WebPageProxy.h"
@@ -27,12 +26,14 @@
namespace WebKit {
+enum class UndoOrRedo;
+
class DefaultUndoController {
public:
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo);
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo);
void clearAllEditCommands();
- bool canUndoRedo(WebPageProxy::UndoOrRedo);
- void executeUndoRedo(WebPageProxy::UndoOrRedo);
+ bool canUndoRedo(UndoOrRedo);
+ void executeUndoRedo(UndoOrRedo);
private:
typedef Vector<RefPtr<WebEditCommandProxy> > CommandVector;
@@ -41,5 +42,3 @@
};
} // namespace WebKit
-
-#endif // DefaultUndoController_h
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -25,10 +25,11 @@
#pragma once
+#include "LayerTreeContext.h"
+#include "SameDocumentNavigationType.h"
#include "ShareableBitmap.h"
#include "WebColorPicker.h"
#include "WebDataListSuggestionsDropdown.h"
-#include "WebPageProxy.h"
#include "WebPopupMenuProxy.h"
#include <WebCore/AlternativeTextClient.h>
#include <WebCore/EditorClient.h>
@@ -37,9 +38,12 @@
#include <wtf/Forward.h>
#if PLATFORM(COCOA)
+#include "LayerRepresentation.h"
#include "PluginComplexTextInputState.h"
+#include "WKFoundation.h"
OBJC_CLASS CALayer;
+OBJC_CLASS _WKRemoteObjectRegistry;
#if USE(APPKIT)
OBJC_CLASS WKView;
@@ -47,14 +51,37 @@
#endif
#endif
+namespace API {
+class HitTestResult;
+class Object;
+class OpenPanelParameters;
+class SecurityOrigin;
+}
+
+namespace IPC {
+class DataReference;
+}
+
namespace WebCore {
+class Color;
class Cursor;
+class FloatQuad;
+class Region;
class TextIndicator;
class WebMediaSessionManager;
+
+enum class RouteSharingPolicy;
+enum class ScrollbarStyle;
enum class TextIndicatorWindowLifetime : uint8_t;
enum class TextIndicatorWindowDismissalAnimation : uint8_t;
+
+struct DictionaryPopupInfo;
struct Highlight;
+struct TextIndicatorData;
struct ViewportAttributes;
+
+template <typename> class RectEdges;
+using FloatBoxExtent = RectEdges<float>;
}
#if ENABLE(DRAG_SUPPORT)
@@ -65,15 +92,30 @@
namespace WebKit {
+enum class UndoOrRedo;
+
+class ContextMenuContextData;
+class DownloadProxy;
class DrawingAreaProxy;
+class NativeWebGestureEvent;
class NativeWebKeyboardEvent;
class NativeWebMouseEvent;
+class NativeWebWheelEvent;
class RemoteLayerTreeTransaction;
+class UserData;
class ViewSnapshot;
+class WebBackForwardListItem;
class WebContextMenuProxy;
class WebEditCommandProxy;
+class WebFrameProxy;
+class WebOpenPanelResultListenerProxy;
+class WebPageProxy;
class WebPopupMenuProxy;
+struct AssistedNodeInformation;
+struct InteractionInformationAtPosition;
+struct WebHitTestResultData;
+
#if ENABLE(TOUCH_EVENTS)
class NativeWebTouchEvent;
#endif
@@ -169,10 +211,10 @@
virtual void setCursorHiddenUntilMouseMoves(bool) = 0;
virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) = 0;
- virtual void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) = 0;
+ virtual void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) = 0;
virtual void clearAllEditCommands() = 0;
- virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) = 0;
- virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) = 0;
+ virtual bool canUndoRedo(UndoOrRedo) = 0;
+ virtual void executeUndoRedo(UndoOrRedo) = 0;
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
#if PLATFORM(COCOA)
virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
Modified: trunk/Source/WebKit/UIProcess/WebEditCommandProxy.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/WebEditCommandProxy.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/WebEditCommandProxy.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebEditCommandProxy.h"
+#include "UndoOrRedo.h"
#include "WebPageMessages.h"
#include "WebPageProxy.h"
#include "WebProcessProxy.h"
@@ -56,7 +57,7 @@
return;
m_page->process().send(Messages::WebPage::UnapplyEditCommand(m_commandID), m_page->pageID(), IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
- m_page->registerEditCommand(*this, WebPageProxy::Redo);
+ m_page->registerEditCommand(*this, UndoOrRedo::Redo);
}
void WebEditCommandProxy::reapply()
@@ -65,7 +66,7 @@
return;
m_page->process().send(Messages::WebPage::ReapplyEditCommand(m_commandID), m_page->pageID(), IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
- m_page->registerEditCommand(*this, WebPageProxy::Undo);
+ m_page->registerEditCommand(*this, UndoOrRedo::Undo);
}
String WebEditCommandProxy::nameForEditAction(EditAction editAction)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -80,6 +80,7 @@
#include "TextCheckerState.h"
#include "UIMessagePortChannelProvider.h"
#include "URLSchemeTaskParameters.h"
+#include "UndoOrRedo.h"
#include "UserMediaPermissionRequestProxy.h"
#include "UserMediaProcessManager.h"
#include "WKContextPrivate.h"
@@ -4936,7 +4937,7 @@
void WebPageProxy::registerEditCommandForUndo(uint64_t commandID, uint32_t editAction)
{
- registerEditCommand(WebEditCommandProxy::create(commandID, static_cast<EditAction>(editAction), this), Undo);
+ registerEditCommand(WebEditCommandProxy::create(commandID, static_cast<EditAction>(editAction), this), UndoOrRedo::Undo);
}
void WebPageProxy::registerInsertionUndoGrouping()
@@ -4946,15 +4947,14 @@
#endif
}
-void WebPageProxy::canUndoRedo(uint32_t action, bool& result)
+void WebPageProxy::canUndoRedo(UndoOrRedo action, bool& result)
{
- result = m_pageClient.canUndoRedo(static_cast<UndoOrRedo>(action));
+ result = m_pageClient.canUndoRedo(action);
}
-void WebPageProxy::executeUndoRedo(uint32_t action, bool& result)
+void WebPageProxy::executeUndoRedo(UndoOrRedo action)
{
- m_pageClient.executeUndoRedo(static_cast<UndoOrRedo>(action));
- result = true;
+ m_pageClient.executeUndoRedo(action);
}
void WebPageProxy::clearAllEditCommands()
@@ -5317,16 +5317,12 @@
bool WebPageProxy::canUndo()
{
- bool result;
- canUndoRedo(Undo, result);
- return result;
+ return m_pageClient.canUndoRedo(UndoOrRedo::Undo);
}
bool WebPageProxy::canRedo()
{
- bool result;
- canUndoRedo(Redo, result);
- return result;
+ return m_pageClient.canUndoRedo(UndoOrRedo::Redo);
}
bool WebPageProxy::isValidEditCommand(WebEditCommandProxy* command)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -260,6 +260,7 @@
struct URLSchemeTaskParameters;
enum class ShouldProcessSwapIfPossible;
+enum class UndoOrRedo;
#if USE(QUICK_LOOK)
class QuickLookDocumentData;
@@ -951,7 +952,6 @@
virtual void exitAcceleratedCompositingMode();
virtual void updateAcceleratedCompositingMode(const LayerTreeContext&);
- enum UndoOrRedo { Undo, Redo };
void addEditCommand(WebEditCommandProxy*);
void removeEditCommand(WebEditCommandProxy*);
bool isValidEditCommand(WebEditCommandProxy*);
@@ -1551,8 +1551,8 @@
void registerEditCommandForUndo(uint64_t commandID, uint32_t editAction);
void registerInsertionUndoGrouping();
void clearAllEditCommands();
- void canUndoRedo(uint32_t action, bool& result);
- void executeUndoRedo(uint32_t action, bool& result);
+ void canUndoRedo(UndoOrRedo, bool& result);
+ void executeUndoRedo(UndoOrRedo);
// Keyboard handling
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-07-27 22:32:25 UTC (rev 234333)
@@ -238,8 +238,8 @@
RegisterEditCommandForUndo(uint64_t commandID, uint32_t editAction)
ClearAllEditCommands()
RegisterInsertionUndoGrouping()
- CanUndoRedo(uint32_t action) -> (bool result)
- ExecuteUndoRedo(uint32_t action) -> (bool result)
+ CanUndoRedo(enum WebKit::UndoOrRedo undoOrRedo) -> (bool result)
+ ExecuteUndoRedo(enum WebKit::UndoOrRedo undoOrRedo) -> ()
# Diagnostic messages logging
LogDiagnosticMessage(String message, String description, enum WebCore::ShouldSample shouldSample)
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -39,7 +39,9 @@
}
namespace WebKit {
-
+
+enum class UndoOrRedo;
+
class PageClientImpl : public PageClientImplCocoa
#if ENABLE(FULLSCREEN_API)
, public WebFullScreenManagerProxyClient
@@ -76,10 +78,10 @@
void setCursor(const WebCore::Cursor&) override;
void setCursorHiddenUntilMouseMoves(bool) override;
void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) override;
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) override;
void clearAllEditCommands() override;
- bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
- void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ bool canUndoRedo(UndoOrRedo) override;
+ void executeUndoRedo(UndoOrRedo) override;
void accessibilityWebProcessTokenReceived(const IPC::DataReference&) override;
bool executeSavedCommandBySelector(const String& selector) override;
void updateSecureInputState() override;
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2018-07-27 22:32:25 UTC (rev 234333)
@@ -37,6 +37,7 @@
#import "NavigationState.h"
#import "StringUtilities.h"
#import "UIKitSPI.h"
+#import "UndoOrRedo.h"
#import "ViewSnapshotStore.h"
#import "WKContentView.h"
#import "WKContentViewInteraction.h"
@@ -304,13 +305,13 @@
notImplemented();
}
-void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
RetainPtr<WKEditCommandObjC> commandObjC = adoptNS([[WKEditCommandObjC alloc] initWithWebEditCommandProxy:command.copyRef()]);
String actionName = WebEditCommandProxy::nameForEditAction(command->editAction());
NSUndoManager *undoManager = [m_contentView undoManager];
- [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == WebPageProxy::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
+ [undoManager registerUndoWithTarget:m_undoTarget.get() selector:((undoOrRedo == UndoOrRedo::Undo) ? @selector(undoEditing:) : @selector(redoEditing:)) object:commandObjC.get()];
if (!actionName.isEmpty())
[undoManager setActionName:(NSString *)actionName];
}
@@ -327,14 +328,14 @@
[[m_contentView undoManager] removeAllActionsWithTarget:m_undoTarget.get()];
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+bool PageClientImpl::canUndoRedo(UndoOrRedo undoOrRedo)
{
- return (undoOrRedo == WebPageProxy::Undo) ? [[m_contentView undoManager] canUndo] : [[m_contentView undoManager] canRedo];
+ return (undoOrRedo == UndoOrRedo::Undo) ? [[m_contentView undoManager] canUndo] : [[m_contentView undoManager] canRedo];
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::executeUndoRedo(UndoOrRedo undoOrRedo)
{
- return (undoOrRedo == WebPageProxy::Undo) ? [[m_contentView undoManager] undo] : [[m_contentView undoManager] redo];
+ return (undoOrRedo == UndoOrRedo::Undo) ? [[m_contentView undoManager] undo] : [[m_contentView undoManager] redo];
}
void PageClientImpl::accessibilityWebProcessTokenReceived(const IPC::DataReference& data)
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -91,10 +91,10 @@
void setCursorHiddenUntilMouseMoves(bool) override;
void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) override;
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) override;
void clearAllEditCommands() override;
- bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
- void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ bool canUndoRedo(UndoOrRedo) override;
+ void executeUndoRedo(UndoOrRedo) override;
bool executeSavedCommandBySelector(const String& selector) override;
void startDrag(const WebCore::DragItem&, const ShareableBitmap::Handle& image) override;
void setPromisedDataForImage(const String& pasteboardName, Ref<WebCore::SharedBuffer>&& imageBuffer, const String& filename, const String& extension, const String& title,
Modified: trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.mm 2018-07-27 22:32:25 UTC (rev 234333)
@@ -39,6 +39,7 @@
#import "NativeWebWheelEvent.h"
#import "NavigationState.h"
#import "StringUtilities.h"
+#import "UndoOrRedo.h"
#import "ViewGestureController.h"
#import "ViewSnapshotStore.h"
#import "WKAPICast.h"
@@ -50,6 +51,7 @@
#import "WebContextMenuProxyMac.h"
#import "WebDataListSuggestionsDropdownMac.h"
#import "WebEditCommandProxy.h"
+#import "WebPageProxy.h"
#import "WebPopupMenuProxyMac.h"
#import "WebViewImpl.h"
#import "WindowServerConnection.h"
@@ -66,6 +68,7 @@
#import <WebCore/Image.h>
#import <WebCore/KeyboardEvent.h>
#import <WebCore/NotImplemented.h>
+#import <WebCore/PlatformScreen.h>
#import <WebCore/PromisedBlobInfo.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/TextIndicator.h>
@@ -330,7 +333,7 @@
{
}
-void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
m_impl->registerEditCommand(WTFMove(command), undoOrRedo);
}
@@ -347,14 +350,14 @@
m_impl->clearAllEditCommands();
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+bool PageClientImpl::canUndoRedo(UndoOrRedo undoOrRedo)
{
- return (undoOrRedo == WebPageProxy::Undo) ? [[m_view undoManager] canUndo] : [[m_view undoManager] canRedo];
+ return (undoOrRedo == UndoOrRedo::Undo) ? [[m_view undoManager] canUndo] : [[m_view undoManager] canRedo];
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::executeUndoRedo(UndoOrRedo undoOrRedo)
{
- return (undoOrRedo == WebPageProxy::Undo) ? [[m_view undoManager] undo] : [[m_view undoManager] redo];
+ return (undoOrRedo == UndoOrRedo::Undo) ? [[m_view undoManager] undo] : [[m_view undoManager] redo];
}
void PageClientImpl::startDrag(const WebCore::DragItem& item, const ShareableBitmap::Handle& image)
Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2018-07-27 22:32:25 UTC (rev 234333)
@@ -40,6 +40,7 @@
#import "WebContextMenuItem.h"
#import "WebContextMenuItemData.h"
#import "WebContextMenuListenerProxy.h"
+#import "WebPageProxy.h"
#import "WebProcessProxy.h"
#import <WebCore/GraphicsContext.h>
#import <WebCore/IntRect.h>
Modified: trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/win/PageClientImpl.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -121,7 +121,7 @@
notImplemented();
}
-void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::registerEditCommand(Ref<WebEditCommandProxy>&& command, UndoOrRedo undoOrRedo)
{
m_undoController.registerEditCommand(WTFMove(command), undoOrRedo);
}
@@ -131,12 +131,12 @@
m_undoController.clearAllEditCommands();
}
-bool PageClientImpl::canUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+bool PageClientImpl::canUndoRedo(UndoOrRedo undoOrRedo)
{
return m_undoController.canUndoRedo(undoOrRedo);
}
-void PageClientImpl::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
+void PageClientImpl::executeUndoRedo(UndoOrRedo undoOrRedo)
{
m_undoController.executeUndoRedo(undoOrRedo);
}
Modified: trunk/Source/WebKit/UIProcess/win/PageClientImpl.h (234332 => 234333)
--- trunk/Source/WebKit/UIProcess/win/PageClientImpl.h 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/UIProcess/win/PageClientImpl.h 2018-07-27 22:32:25 UTC (rev 234333)
@@ -40,6 +40,8 @@
class WebPageNamespace;
class WebView;
+enum class UndoOrRedo;
+
class PageClientImpl : public PageClient
#if ENABLE(FULLSCREEN_API)
, public WebFullScreenManagerProxyClient
@@ -68,10 +70,10 @@
void setCursor(const WebCore::Cursor&) override;
void setCursorHiddenUntilMouseMoves(bool) override;
void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
- void registerEditCommand(Ref<WebEditCommandProxy>&&, WebPageProxy::UndoOrRedo) override;
+ void registerEditCommand(Ref<WebEditCommandProxy>&&, UndoOrRedo) override;
void clearAllEditCommands() override;
- bool canUndoRedo(WebPageProxy::UndoOrRedo) override;
- void executeUndoRedo(WebPageProxy::UndoOrRedo) override;
+ bool canUndoRedo(UndoOrRedo) override;
+ void executeUndoRedo(UndoOrRedo) override;
WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override;
WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override;
WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) override;
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (234332 => 234333)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-07-27 22:32:25 UTC (rev 234333)
@@ -1278,6 +1278,7 @@
5C26958520043212005C439B /* WKOpenPanelParametersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C26958420042F12005C439B /* WKOpenPanelParametersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
5C3AEA8F1FE1F21F002318D3 /* WebsitePoliciesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C3AEA8E1FE1F1DF002318D3 /* WebsitePoliciesData.cpp */; };
+ 5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */; };
5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C6CE6D11F59BC7A0007C6CB /* PageClientImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */; };
5C7706741D1138380012700F /* WebSocketProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7706731D111D8B0012700F /* WebSocketProvider.cpp */; };
@@ -3835,6 +3836,7 @@
5C26958420042F12005C439B /* WKOpenPanelParametersPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParametersPrivate.h; sourceTree = "<group>"; };
5C298D9E1C3DEF2900470AFE /* PendingDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PendingDownload.h; path = NetworkProcess/Downloads/PendingDownload.h; sourceTree = "<group>"; };
5C3AEA8E1FE1F1DF002318D3 /* WebsitePoliciesData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebsitePoliciesData.cpp; sourceTree = "<group>"; };
+ 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UndoOrRedo.h; sourceTree = "<group>"; };
5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; };
5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
5C6CE6D31F59EA350007C6CB /* PageClientImplCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImplCocoa.h; sourceTree = "<group>"; };
@@ -5428,6 +5430,7 @@
2FD43B911FA006A10083F51C /* TouchBarMenuData.h */,
2F809DD51FBD1BC9005FE63A /* TouchBarMenuItemData.cpp */,
2F809DD91FBD1BF2005FE63A /* TouchBarMenuItemData.h */,
+ 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */,
1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */,
1A64245C12DE29A100CAAE2C /* UpdateInfo.h */,
5C19A51E1FD0B14600EEA323 /* URLSchemeTaskParameters.cpp */,
@@ -9394,6 +9397,7 @@
515BE1A91D55293400DD7C68 /* UIGamepadProvider.h in Headers */,
CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */,
513FFB8D201459B0002596EA /* UIMessagePortChannelProvider.h in Headers */,
+ 5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */,
1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */,
5C19A5201FD0B29500EEA323 /* URLSchemeTaskParameters.h in Headers */,
1AC1336818565B5700F3EC05 /* UserData.h in Headers */,
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp (234332 => 234333)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp 2018-07-27 22:29:58 UTC (rev 234332)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.cpp 2018-07-27 22:32:25 UTC (rev 234333)
@@ -27,6 +27,7 @@
#include "WebEditorClient.h"
#include "EditorState.h"
+#include "UndoOrRedo.h"
#include "WKBundlePageEditorClient.h"
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
@@ -304,7 +305,7 @@
bool WebEditorClient::canUndo() const
{
bool result = false;
- m_page->sendSync(Messages::WebPageProxy::CanUndoRedo(static_cast<uint32_t>(WebPageProxy::Undo)), Messages::WebPageProxy::CanUndoRedo::Reply(result));
+ m_page->sendSync(Messages::WebPageProxy::CanUndoRedo(UndoOrRedo::Undo), Messages::WebPageProxy::CanUndoRedo::Reply(result));
return result;
}
@@ -311,20 +312,18 @@
bool WebEditorClient::canRedo() const
{
bool result = false;
- m_page->sendSync(Messages::WebPageProxy::CanUndoRedo(static_cast<uint32_t>(WebPageProxy::Redo)), Messages::WebPageProxy::CanUndoRedo::Reply(result));
+ m_page->sendSync(Messages::WebPageProxy::CanUndoRedo(UndoOrRedo::Redo), Messages::WebPageProxy::CanUndoRedo::Reply(result));
return result;
}
void WebEditorClient::undo()
{
- bool result = false;
- m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(static_cast<uint32_t>(WebPageProxy::Undo)), Messages::WebPageProxy::ExecuteUndoRedo::Reply(result));
+ m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(UndoOrRedo::Undo), Messages::WebPageProxy::ExecuteUndoRedo::Reply());
}
void WebEditorClient::redo()
{
- bool result = false;
- m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(static_cast<uint32_t>(WebPageProxy::Redo)), Messages::WebPageProxy::ExecuteUndoRedo::Reply(result));
+ m_page->sendSync(Messages::WebPageProxy::ExecuteUndoRedo(UndoOrRedo::Redo), Messages::WebPageProxy::ExecuteUndoRedo::Reply());
}
#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(WPE)
