Use WebWidget from the WebKit API. This change also makes...

webkit/tools/test_shell/event_sending_controller.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the definition for EventSendingController.
 //
 // Some notes about drag and drop handling:
 // Windows drag and drop goes through a system call to DoDragDrop.  At that
 // point, program control is given to Windows which then periodically makes
 // callbacks into the webview.  This won't work for layout tests, so instead,
@@ skipping 230 matching lines @@
 
 //
 // Implemented javascript methods.
 //
 
 void EventSendingController::mouseDown(
     const CppArgumentList& args, CppVariant* result) {
   if (result)  // Could be NULL if invoked asynchronously.
     result->SetNull();
 
-  webview()->Layout();
+  webview()->layout();
 
   int button_number = GetButtonNumberFromSingleArg(args);
   DCHECK(button_number != -1);
 
   WebMouseEvent::Button button_type = GetButtonTypeFromButtonNumber(
       button_number);
 
   if ((GetCurrentEventTimeSec() - last_click_time_sec < kMultiClickTimeSec) &&
       (!outside_multiclick_radius(last_mouse_pos_, last_click_pos)) &&
       (button_number == last_button_number_)) {
     ++click_count;
   } else {
     click_count = 1;
   }
 
   last_button_number_ = button_number;
 
   WebMouseEvent event;
   pressed_button_ = button_type;
   InitMouseEvent(WebInputEvent::MouseDown, button_type,
                  last_mouse_pos_, &event);
-  webview()->HandleInputEvent(&event);
+  webview()->handleInputEvent(event);
 }
 
 void EventSendingController::mouseUp(
     const CppArgumentList& args, CppVariant* result) {
   if (result)  // Could be NULL if invoked asynchronously.
     result->SetNull();
 
-  webview()->Layout();
+  webview()->layout();
 
   int button_number = GetButtonNumberFromSingleArg(args);
   DCHECK(button_number != -1);
 
   WebMouseEvent::Button button_type = GetButtonTypeFromButtonNumber(
       button_number);
 
   last_button_number_ = button_number;
 
   WebMouseEvent event;
   InitMouseEvent(WebInputEvent::MouseUp, button_type,
                  last_mouse_pos_, &event);
   if (drag_mode() && !replaying_saved_events) {
     mouse_event_queue.push(event);
     ReplaySavedEvents();
   } else {
     DoMouseUp(event);
   }
 
   last_click_time_sec = event.timeStampSeconds;
   last_click_pos = gfx::Point(event.x, event.y);
 }
 
 /* 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.
   if (!current_drag_data.isNull()) {
     WebPoint client_point(e.x, e.y);
     WebPoint screen_point(e.globalX, e.globalY);
 
     bool valid = webview()->DragTargetDragOver(client_point, screen_point);
     if (valid) {
       webview()->DragSourceEndedAt(client_point, screen_point);
       webview()->DragTargetDrop(client_point, screen_point);
     } else {
       webview()->DragSourceEndedAt(client_point, screen_point);
       webview()->DragTargetDragLeave();
     }
 
     current_drag_data.reset();
   }
 }
 
 void EventSendingController::mouseMoveTo(
     const CppArgumentList& args, CppVariant* result) {
   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());
     InitMouseEvent(WebInputEvent::MouseMove, pressed_button_,
                    last_mouse_pos_, &event);
 
     if (drag_mode() && pressed_button_ != WebMouseEvent::ButtonNone &&
         !replaying_saved_events) {
       mouse_event_queue.push(event);
     } else {
       DoMouseMove(event);
     }
   }
 }
 
 // static
 void EventSendingController::DoMouseMove(const WebMouseEvent& e) {
-  webview()->HandleInputEvent(&e);
+  webview()->handleInputEvent(e);
 
   if (pressed_button_ != WebMouseEvent::ButtonNone &&
       !current_drag_data.isNull()) {
     WebPoint client_point(e.x, e.y);
     WebPoint screen_point(e.globalX, e.globalY);
 
     webview()->DragSourceMovedTo(client_point, screen_point);
     webview()->DragTargetDragOver(client_point, screen_point);
   }
 }
@@ skipping 60 matching lines @@
     if (args.size() >= 2 && (args[1].isObject() || args[1].isString()))
       ApplyKeyModifiers(&(args[1]), &event_down);
 
     if (needs_shift_key_modifier)
       event_down.modifiers |= WebInputEvent::ShiftKey;
 
     event_up = event_down;
     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);
   }
 }
 
 void EventSendingController::dispatchMessage(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 
 #if defined(OS_WIN)
   if (args.size() == 3) {
     // Grab the message id to see if we need to dispatch it.
     int msg = args[0].ToInt32();
 
     // WebKit's version of this function stuffs a MSG struct and uses
     // TranslateMessage and DispatchMessage. We use a WebKeyboardEvent, which
     // doesn't need to receive the DeadChar and SysDeadChar messages.
     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";
   }
 #endif
 }
 
 bool EventSendingController::NeedsShiftModifier(int key_code) {
   // If code is an uppercase letter, assign a SHIFT key to
   // event_down.modifier, this logic comes from
   // WebKit/WebKitTools/DumpRenderTree/Win/EventSender.cpp
@@ skipping 57 matching lines @@
     }
   }
 
   replaying_saved_events = false;
 }
 
 void EventSendingController::contextClick(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 
-  webview()->Layout();
+  webview()->layout();
 
   if (GetCurrentEventTimeSec() - last_click_time_sec >= 1) {
     click_count = 1;
   } else {
     ++click_count;
   }
 
   // Generate right mouse down and up.
 
   WebMouseEvent event;
   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;
 }
 
 void EventSendingController::scheduleAsynchronousClick(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 
   MessageLoop::current()->PostTask(FROM_HERE,
       method_factory_.NewRunnableMethod(&EventSendingController::mouseDown,
@@ skipping 14 matching lines @@
 
 void EventSendingController::fireKeyboardEventsToElement(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void EventSendingController::clearKillRing(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }