diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 23:30:22 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 23:30:22 +0000 |
| commit | 62cb33cae4bad68a085b50832c8a7f1e1c2e917c (patch) | |
| tree | 4eddbf29c7ae1c41fd1300ae4ce95b817404bbaf /webkit/glue/webwidget_impl.cc | |
| parent | 57346c5659ada3c2a06095afac6e53bedf41ab94 (diff) | |
| download | chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.zip chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.tar.gz chromium_src-62cb33cae4bad68a085b50832c8a7f1e1c2e917c.tar.bz2 | |
Use Webkit::WebInputEvent and remove webkit/glue/webinputevent.
This change adds a temporary dependency on src/KeyIdentifier.{h,cpp} which I am going to remove after this CL. I didn't want to grow this CL any larger.
R=dglazkov
Review URL: http://codereview.chromium.org/53099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webwidget_impl.cc')
| -rw-r--r-- | webkit/glue/webwidget_impl.cc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index 52e5ed0..1ea7c1c 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -22,14 +22,19 @@ MSVC_POP_WARNING(); #include "base/gfx/rect.h" #include "base/logging.h" #include "skia/ext/platform_canvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/event_conversion.h" #include "webkit/glue/glue_util.h" -#include "webkit/glue/webinputevent.h" #include "webkit/glue/webwidget_delegate.h" #include "webkit/glue/webwidget_impl.h" using namespace WebCore; +using WebKit::WebInputEvent; +using WebKit::WebKeyboardEvent; +using WebKit::WebMouseEvent; +using WebKit::WebMouseWheelEvent; + // WebWidget ---------------------------------------------------------------- /*static*/ @@ -165,30 +170,30 @@ bool WebWidgetImpl::HandleInputEvent(const WebInputEvent* input_event) { // methods. For now we'll assume it has processed them (as we are only // interested in whether keyboard events are processed). switch (input_event->type) { - case WebInputEvent::MOUSE_MOVE: + case WebInputEvent::MouseMove: MouseMove(*static_cast<const WebMouseEvent*>(input_event)); return true; - case WebInputEvent::MOUSE_LEAVE: + case WebInputEvent::MouseLeave: MouseLeave(*static_cast<const WebMouseEvent*>(input_event)); return true; - case WebInputEvent::MOUSE_WHEEL: + case WebInputEvent::MouseWheel: MouseWheel(*static_cast<const WebMouseWheelEvent*>(input_event)); return true; - case WebInputEvent::MOUSE_DOWN: - case WebInputEvent::MOUSE_DOUBLE_CLICK: + case WebInputEvent::MouseDown: + case WebInputEvent::MouseDoubleClick: MouseDown(*static_cast<const WebMouseEvent*>(input_event)); return true; - case WebInputEvent::MOUSE_UP: + case WebInputEvent::MouseUp: MouseUp(*static_cast<const WebMouseEvent*>(input_event)); return true; - case WebInputEvent::RAW_KEY_DOWN: - case WebInputEvent::KEY_DOWN: - case WebInputEvent::KEY_UP: + case WebInputEvent::RawKeyDown: + case WebInputEvent::KeyDown: + case WebInputEvent::KeyUp: return KeyEvent(*static_cast<const WebKeyboardEvent*>(input_event)); default: |