Move glue/event_conversion.{h,cc} into the WebKit API implementation.

I also renamed the MakeFoo classes to FooBuilder so that it would be
more clear at the call sites that you are dealing with a class.

I then translated the ToBar functions to also be BarBuilder classes.
I just did this for consistency with the FooBuilders.

For reference, "Foo" refers to WebCore Platform*Event classes and
"Bar" refers to WebInputEvent subclasses :-)

R=jorlow
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/164524

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23425 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/webkit/glue/webpopupmenu_impl.cc b/webkit/glue/webpopupmenu_impl.cc
index 74b40ab..326a326 100644
--- a/webkit/glue/webpopupmenu_impl.cc
+++ b/webkit/glue/webpopupmenu_impl.cc
@@ -20,12 +20,15 @@
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebWidgetClient.h"
-#include "webkit/glue/event_conversion.h"
+#include "webkit/api/src/WebInputEventConversion.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webpopupmenu_impl.h"
 
 using namespace WebCore;
 
+using WebKit::PlatformKeyboardEventBuilder;
+using WebKit::PlatformMouseEventBuilder;
+using WebKit::PlatformWheelEventBuilder;
 using WebKit::WebCanvas;
 using WebKit::WebCompositionCommand;
 using WebKit::WebInputEvent;
@@ -81,29 +84,29 @@ void WebPopupMenuImpl::MouseMove(const WebMouseEvent& event) {
   if (event.x != last_mouse_position_.x ||
       event.y != last_mouse_position_.y) {
     last_mouse_position_ = WebPoint(event.x, event.y);
-    widget_->handleMouseMoveEvent(MakePlatformMouseEvent(widget_, event));
+    widget_->handleMouseMoveEvent(PlatformMouseEventBuilder(widget_, event));
   }
 }
 
 void WebPopupMenuImpl::MouseLeave(const WebMouseEvent& event) {
-  widget_->handleMouseMoveEvent(MakePlatformMouseEvent(widget_, event));
+  widget_->handleMouseMoveEvent(PlatformMouseEventBuilder(widget_, event));
 }
 
 void WebPopupMenuImpl::MouseDown(const WebMouseEvent& event) {
-  widget_->handleMouseDownEvent(MakePlatformMouseEvent(widget_, event));
+  widget_->handleMouseDownEvent(PlatformMouseEventBuilder(widget_, event));
 }
 
 void WebPopupMenuImpl::MouseUp(const WebMouseEvent& event) {
   mouseCaptureLost();
-  widget_->handleMouseReleaseEvent(MakePlatformMouseEvent(widget_, event));
+  widget_->handleMouseReleaseEvent(PlatformMouseEventBuilder(widget_, event));
 }
 
 void WebPopupMenuImpl::MouseWheel(const WebMouseWheelEvent& event) {
-  widget_->handleWheelEvent(MakePlatformWheelEvent(widget_, event));
+  widget_->handleWheelEvent(PlatformWheelEventBuilder(widget_, event));
 }
 
 bool WebPopupMenuImpl::KeyEvent(const WebKeyboardEvent& event) {
-  return widget_->handleKeyEvent(MakePlatformKeyboardEvent(event));
+  return widget_->handleKeyEvent(PlatformKeyboardEventBuilder(event));
 }
 
 // WebWidget -------------------------------------------------------------------