summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/event_sending_controller.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 06:36:28 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-16 06:36:28 +0000
commit4873c7de675554a357717ddedc1fcaca2820de19 (patch)
treecd6446547d3b9d57f634187aecb1853c5ecbc8fb /webkit/tools/test_shell/event_sending_controller.cc
parent3b846396a90174835320be2ff50afe8dd4e31590 (diff)
downloadchromium_src-4873c7de675554a357717ddedc1fcaca2820de19.zip
chromium_src-4873c7de675554a357717ddedc1fcaca2820de19.tar.gz
chromium_src-4873c7de675554a357717ddedc1fcaca2820de19.tar.bz2
Reverting 20855.
Review URL: http://codereview.chromium.org/149744 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/event_sending_controller.cc')
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc33
1 files changed, 16 insertions, 17 deletions
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 79e3d85..a29978f 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -248,7 +248,7 @@ void EventSendingController::mouseDown(
if (result) // Could be NULL if invoked asynchronously.
result->SetNull();
- webview()->Layout();
+ webview()->layout();
int button_number = GetButtonNumberFromSingleArg(args);
DCHECK(button_number != -1);
@@ -270,7 +270,7 @@ void EventSendingController::mouseDown(
pressed_button_ = button_type;
InitMouseEvent(WebInputEvent::MouseDown, button_type,
last_mouse_pos_, &event);
- webview()->HandleInputEvent(&event);
+ webview()->handleInputEvent(event);
}
void EventSendingController::mouseUp(
@@ -278,7 +278,7 @@ void EventSendingController::mouseUp(
if (result) // Could be NULL if invoked asynchronously.
result->SetNull();
- webview()->Layout();
+ webview()->layout();
int button_number = GetButtonNumberFromSingleArg(args);
DCHECK(button_number != -1);
@@ -303,7 +303,7 @@ void EventSendingController::mouseUp(
}
/* static */ void EventSendingController::DoMouseUp(const WebMouseEvent& e) {
- webview()->HandleInputEvent(&e);
+ webview()->handleInputEvent(e);
pressed_button_ = WebMouseEvent::ButtonNone;
// If we're in a drag operation, complete it.
@@ -329,7 +329,7 @@ void EventSendingController::mouseMoveTo(
result->SetNull();
if (args.size() >= 2 && args[0].isNumber() && args[1].isNumber()) {
- webview()->Layout();
+ webview()->layout();
WebMouseEvent event;
last_mouse_pos_.SetPoint(args[0].ToInt32(), args[1].ToInt32());
@@ -347,7 +347,7 @@ void EventSendingController::mouseMoveTo(
// static
void EventSendingController::DoMouseMove(const WebMouseEvent& e) {
- webview()->HandleInputEvent(&e);
+ webview()->handleInputEvent(e);
if (pressed_button_ != WebMouseEvent::ButtonNone &&
!current_drag_data.isNull()) {
@@ -428,20 +428,20 @@ void EventSendingController::keyDown(
event_up.type = WebInputEvent::KeyUp;
// EventSendingController.m forces a layout here, with at least one
// test (fast\forms\focus-control-to-page.html) relying on this.
- webview()->Layout();
+ webview()->layout();
- webview()->HandleInputEvent(&event_down);
+ webview()->handleInputEvent(event_down);
#if defined(OS_WIN)
if (generate_char) {
WebKeyboardEvent event_char = event_down;
event_char.type = WebInputEvent::Char;
event_char.keyIdentifier[0] = '\0';
- webview()->HandleInputEvent(&event_char);
+ webview()->handleInputEvent(event_char);
}
#endif
- webview()->HandleInputEvent(&event_up);
+ webview()->handleInputEvent(event_up);
}
}
@@ -460,12 +460,11 @@ void EventSendingController::dispatchMessage(
if (msg == WM_DEADCHAR || msg == WM_SYSDEADCHAR)
return;
- webview()->Layout();
+ webview()->layout();
unsigned long lparam = static_cast<unsigned long>(args[2].ToDouble());
- const WebKeyboardEvent& key_event = WebInputEventFactory::keyboardEvent(
- NULL, msg, args[1].ToInt32(), lparam);
- webview()->HandleInputEvent(&key_event);
+ webview()->handleInputEvent(WebInputEventFactory::keyboardEvent(
+ NULL, msg, args[1].ToInt32(), lparam));
} else {
NOTREACHED() << L"Wrong number of arguments";
}
@@ -543,7 +542,7 @@ void EventSendingController::contextClick(
const CppArgumentList& args, CppVariant* result) {
result->SetNull();
- webview()->Layout();
+ webview()->layout();
if (GetCurrentEventTimeSec() - last_click_time_sec >= 1) {
click_count = 1;
@@ -557,11 +556,11 @@ void EventSendingController::contextClick(
pressed_button_ = WebMouseEvent::ButtonRight;
InitMouseEvent(WebInputEvent::MouseDown, WebMouseEvent::ButtonRight,
last_mouse_pos_, &event);
- webview()->HandleInputEvent(&event);
+ webview()->handleInputEvent(event);
InitMouseEvent(WebInputEvent::MouseUp, WebMouseEvent::ButtonRight,
last_mouse_pos_, &event);
- webview()->HandleInputEvent(&event);
+ webview()->handleInputEvent(event);
pressed_button_ = WebMouseEvent::ButtonNone;
}