summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/automation/ui_controls.h4
-rw-r--r--chrome/browser/automation/ui_controls_linux.cc83
-rw-r--r--chrome/browser/browser_focus_uitest.cc2
-rw-r--r--chrome/chrome.gyp1
4 files changed, 77 insertions, 13 deletions
diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h
index 5f3d9e3..113e012 100644
--- a/chrome/browser/automation/ui_controls.h
+++ b/chrome/browser/automation/ui_controls.h
@@ -16,9 +16,11 @@
#include "base/gfx/native_widget_types.h"
#include "base/gfx/point.h"
+#if defined(TOOLKIT_VIEWS)
namespace views {
class View;
}
+#endif
class Task;
@@ -73,7 +75,7 @@ bool SendMouseClick(MouseButton type);
// A combination of SendMouseMove to the middle of the view followed by
// SendMouseEvents.
void MoveMouseToCenterAndPress(
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
views::View* view,
#elif defined(OS_LINUX)
GtkWidget* widget,
diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc
index bcaf6c5..9b5418e 100644
--- a/chrome/browser/automation/ui_controls_linux.cc
+++ b/chrome/browser/automation/ui_controls_linux.cc
@@ -13,6 +13,11 @@
#include "chrome/common/gtk_util.h"
#include "chrome/test/automation/automation_constants.h"
+#if defined(TOOLKIT_VIEWS)
+#include "views/view.h"
+#include "views/widget/widget.h"
+#endif
+
namespace {
guint32 EventTimeNow() {
@@ -33,18 +38,26 @@ class EventWaiter : public MessageLoopForUI::Observer {
// MessageLoop::Observer implementation:
virtual void WillProcessEvent(GdkEvent* event) {
- // No-op.
+ if (event->type == type_) {
+ // At the time we're invoked the event has not actually been processed.
+ // Use PostTask to make sure the event has been processed before
+ // notifying.
+ // NOTE: if processing a message results in running a nested message
+ // loop, then DidProcessEvent isn't immediately sent. As such, we do
+ // the processing in WillProcessEvent rather than DidProcessEvent.
+ MessageLoop::current()->PostTask(FROM_HERE, task_);
+ delete this;
+ }
}
virtual void DidProcessEvent(GdkEvent* event) {
- if (event->any.type == type_) {
- task_->Run();
- delete this;
- }
+ // No-op.
}
private:
- scoped_ptr<Task> task_;
+ // We pass ownership of task_ to MessageLoop when the corrent event is
+ // received.
+ Task *task_;
GdkEventType type_;
};
@@ -57,7 +70,10 @@ class ClickTask : public Task {
virtual ~ClickTask() {}
virtual void Run() {
- ui_controls::SendMouseEventsNotifyWhenDone(button_, state_, followup_);
+ if (followup_)
+ ui_controls::SendMouseEventsNotifyWhenDone(button_, state_, followup_);
+ else
+ ui_controls::SendMouseEvents(button_, state_);
}
private:
@@ -76,7 +92,25 @@ bool SendKeyPress(gfx::NativeWindow window,
GdkEvent* event = gdk_event_new(GDK_KEY_PRESS);
event->key.type = GDK_KEY_PRESS;
- event->key.window = GTK_WIDGET(window)->window;
+ GtkWidget* grab_widget = gtk_grab_get_current();
+ if (grab_widget) {
+ // If there is a grab, send all events to the grabbed widget.
+ event->key.window = grab_widget->window;
+ } else if (window) {
+ event->key.window = GTK_WIDGET(window)->window;
+ } else {
+ // No target was specified. Send the events to the focused window.
+ GList* windows = gtk_window_list_toplevels();
+ for (GList* element = windows; element; element = g_list_next(element)) {
+ GtkWindow* window = GTK_WINDOW(element->data);
+ if (gtk_window_is_active(window)) {
+ event->key.window = GTK_WIDGET(window)->window;
+ break;
+ }
+ }
+ g_list_free(windows);
+ }
+ DCHECK(event->key.window);
g_object_ref(event->key.window);
event->key.send_event = false;
event->key.time = EventTimeNow();
@@ -136,7 +170,15 @@ bool SendMouseEvents(MouseButton type, int state) {
event->button.time = EventTimeNow();
gint x, y;
- event->button.window = gdk_window_at_pointer(&x, &y);
+ GtkWidget* grab_widget = gtk_grab_get_current();
+ if (grab_widget) {
+ // If there is a grab, we need to target all events at it regardless of
+ // what widget the mouse is over.
+ event->button.window = grab_widget->window;
+ gdk_window_get_pointer(event->button.window, &x, &y, NULL);
+ } else {
+ event->button.window = gdk_window_at_pointer(&x, &y);
+ }
g_object_ref(event->button.window);
event->motion.x = x;
event->motion.y = y;
@@ -170,7 +212,18 @@ bool SendMouseEvents(MouseButton type, int state) {
bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, Task* task) {
bool rv = SendMouseEvents(type, state);
- MessageLoop::current()->PostTask(FROM_HERE, task);
+ GdkEventType wait_type;
+ if (state & UP) {
+ wait_type = GDK_BUTTON_RELEASE;
+ } else {
+ if (type == LEFT)
+ wait_type = GDK_BUTTON_PRESS;
+ else if (type == MIDDLE)
+ wait_type = GDK_2BUTTON_PRESS;
+ else
+ wait_type = GDK_3BUTTON_PRESS;
+ }
+ new EventWaiter(task, wait_type);
return rv;
}
@@ -178,6 +231,15 @@ bool SendMouseClick(MouseButton type) {
return SendMouseEvents(type, UP | DOWN);
}
+#if defined(TOOLKIT_VIEWS)
+void MoveMouseToCenterAndPress(views::View* view, MouseButton button,
+ int state, Task* task) {
+ gfx::Point view_center(view->width() / 2, view->height() / 2);
+ views::View::ConvertPointToScreen(view, &view_center);
+ SendMouseMoveNotifyWhenDone(view_center.x(), view_center.y(),
+ new ClickTask(button, state, task));
+}
+#else
void MoveMouseToCenterAndPress(GtkWidget* widget,
MouseButton button,
int state,
@@ -187,5 +249,6 @@ void MoveMouseToCenterAndPress(GtkWidget* widget,
bounds.y() + bounds.height() / 2,
new ClickTask(button, state, task));
}
+#endif
} // namespace ui_controls
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index ede9eba..87290dd 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -81,7 +81,7 @@ class BrowserFocusTest : public InProcessBrowserTest {
void ClickOnView(ViewID vid) {
BrowserWindow* browser_window = browser()->window();
ASSERT_TRUE(browser_window);
-#if defined(OS_WIN)
+#if defined(TOOLKIT_VIEWS)
views::View* view =
reinterpret_cast<BrowserView*>(browser_window)->GetViewByID(vid);
#elif defined(OS_LINUX)
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3e62574..2707932 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4257,7 +4257,6 @@
# Need to port browser_with_test_window_test.* first
'browser/browser_commands_unittest.cc',
'browser/browser_unittest.cc',
- # Need to port browser/automation/ui_controls.h
'browser/extensions/extension_process_manager_unittest.cc',
'browser/importer/importer_unittest.cc',
'browser/login_prompt_unittest.cc',
generated by cgit v1.1 at 2025-02-19 14:41:58 +0000