Changeset 216114 in webkit

Timestamp:

May 3, 2017 1:55:56 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add GTK+ implementation of WebAutomationSession
​https://bugs.webkit.org/show_bug.cgi?id=171431

Reviewed by Michael Catanzaro.

Add platform dependent methods for GTK+ to synthesize events.

• PlatformGTK.cmake:
• UIProcess/API/gtk/WebKitUIClient.cpp: Always resize the window for web views controlled by automation.
• UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::resizeWindowOfBrowsingContext):
(WebKit::WebAutomationSession::moveWindowOfBrowsingContext):
(WebKit::WebAutomationSession::performMouseInteraction):
(WebKit::WebAutomationSession::performKeyboardInteractions):

• UIProcess/Automation/WebAutomationSession.h:
• UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Added.

(WebKit::modifiersToEventState):
(WebKit::mouseButtonToGdkButton):
(WebKit::doMouseEvent):
(WebKit::doMotionEvent):
(WebKit::WebAutomationSession::platformSimulateMouseInteraction):
(WebKit::doKeyStrokeEvent):
(WebKit::keyCodeForVirtualKey):
(WebKit::WebAutomationSession::platformSimulateKeyStroke):
(WebKit::WebAutomationSession::platformSimulateKeySequence):
(WebKit::WebAutomationSession::platformGetBase64EncodedPNGData):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (1 diff)
• UIProcess/API/gtk/WebKitUIClient.cpp (modified) (1 diff)
• UIProcess/Automation/WebAutomationSession.cpp (modified) (9 diffs)
• UIProcess/Automation/WebAutomationSession.h (modified) (1 diff)
• UIProcess/Automation/gtk (added)
• UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp (added)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-05-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add GTK+ implementation of WebAutomationSession
+        https://bugs.webkit.org/show_bug.cgi?id=171431
+
+        Reviewed by Michael Catanzaro.
+
+        Add platform dependent methods for GTK+ to synthesize events.
+
+        * PlatformGTK.cmake:
+        * UIProcess/API/gtk/WebKitUIClient.cpp: Always resize the window for web views controlled by automation.
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        (WebKit::WebAutomationSession::resizeWindowOfBrowsingContext):
+        (WebKit::WebAutomationSession::moveWindowOfBrowsingContext):
+        (WebKit::WebAutomationSession::performMouseInteraction):
+        (WebKit::WebAutomationSession::performKeyboardInteractions):
+        * UIProcess/Automation/WebAutomationSession.h:
+        * UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp: Added.
+        (WebKit::modifiersToEventState):
+        (WebKit::mouseButtonToGdkButton):
+        (WebKit::doMouseEvent):
+        (WebKit::doMotionEvent):
+        (WebKit::WebAutomationSession::platformSimulateMouseInteraction):
+        (WebKit::doKeyStrokeEvent):
+        (WebKit::keyCodeForVirtualKey):
+        (WebKit::WebAutomationSession::platformSimulateKeyStroke):
+        (WebKit::WebAutomationSession::platformSimulateKeySequence):
+        (WebKit::WebAutomationSession::platformGetBase64EncodedPNGData):
+
 2017-05-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -305 +305 @@
     UIProcess/API/gtk/webkit2.h
 
+    UIProcess/Automation/gtk/WebAutomationSessionGtk.cpp
+
     UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp

@@ -140 +140 @@
     {
         GdkRectangle geometry = WebCore::IntRect(frame);
-        webkitWindowPropertiesSetGeometry(webkit_web_view_get_window_properties(m_webView), &geometry);
+        GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
+        if (webkit_web_view_is_controlled_by_automation(m_webView) && WebCore::widgetIsOnscreenToplevelWindow(window) && gtk_widget_get_visible(window)) {
+            if (geometry.x >= 0 && geometry.y >= 0)
+                gtk_window_move(GTK_WINDOW(window), geometry.x, geometry.y);
+            if (geometry.width > 0 && geometry.height > 0)
+                gtk_window_resize(GTK_WINDOW(window), geometry.width, geometry.height);
+        } else
+            webkitWindowPropertiesSetGeometry(webkit_web_view_get_window_properties(m_webView), &geometry);
     }
 

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp

@@ -321 +321 @@
     page->setWindowFrame(newFrame);
 
+#if !PLATFORM(GTK)
     // If nothing changed at all, it's probably fair to report that something went wrong.
     // (We can't assume that the requested frame size will be honored exactly, however.)
@@ -328 +329 @@
         FAIL_WITH_PREDEFINED_ERROR_AND_DETAILS(InternalError, "The window size was expected to have changed, but did not.");
 #endif
+#endif
 }
 
@@ -362 +364 @@
     page->setWindowFrame(newFrame);
 
+#if !PLATFORM(GTK)
     // If nothing changed at all, it's probably fair to report that something went wrong.
     // (We can't assume that the requested frame size will be honored exactly, however.)
@@ -368 +371 @@
     if (originalFrame == updatedFrame)
         FAIL_WITH_PREDEFINED_ERROR_AND_DETAILS(InternalError, "The window position was expected to have changed, but did not.");
+#endif
 #endif
 }
@@ -834 +838 @@
 }
 
-#if USE(APPKIT)
+#if USE(APPKIT) || PLATFORM(GTK)
 static WebEvent::Modifiers protocolModifierToWebEventModifier(Inspector::Protocol::Automation::KeyModifier modifier)
 {
@@ -854 +858 @@
 void WebAutomationSession::performMouseInteraction(Inspector::ErrorString& errorString, const String& handle, const Inspector::InspectorObject& requestedPositionObject, const String& mouseButtonString, const String& mouseInteractionString, const Inspector::InspectorArray& keyModifierStrings, RefPtr<Inspector::Protocol::Automation::Point>& updatedPositionObject)
 {
-#if !USE(APPKIT)
+#if !USE(APPKIT) && !PLATFORM(GTK)
     FAIL_WITH_PREDEFINED_ERROR(NotImplemented);
 #else
@@ -909 +913 @@
 void WebAutomationSession::performKeyboardInteractions(ErrorString& errorString, const String& handle, const Inspector::InspectorArray& interactions, Ref<PerformKeyboardInteractionsCallback>&& callback)
 {
-#if !PLATFORM(COCOA)
+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
     FAIL_WITH_PREDEFINED_ERROR(NotImplemented);
 #else
@@ -1016 +1020 @@
 // Platform-dependent Implementation Stubs.
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(GTK)
 void WebAutomationSession::platformSimulateMouseInteraction(WebKit::WebPageProxy&, const WebCore::IntPoint&, Inspector::Protocol::Automation::MouseInteraction, Inspector::Protocol::Automation::MouseButton, WebEvent::Modifiers)
 {
@@ -1022 +1026 @@
 #endif // !PLATFORM(MAC)
 
-#if !PLATFORM(COCOA)
+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
 void WebAutomationSession::platformSimulateKeyStroke(WebPageProxy&, Inspector::Protocol::Automation::KeyboardInteractionType, Inspector::Protocol::Automation::VirtualKey)
 {

trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h

@@ -226 +226 @@
 #endif
 
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) || PLATFORM(GTK)
     // Keep track of currently active modifiers across multiple keystrokes.
     // We don't synthesize platform keyboard events on iOS, so we need to track it ourselves.
+    // GTK+ doesn't keep track of the active modifiers when using synthesized events.
     unsigned m_currentModifiers { 0 };
 #endif