diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 04:08:18 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 04:08:18 +0000 |
commit | 754cf1378f28f3a5787bbb856b39d9fb64365a50 (patch) | |
tree | b8b5b9e0e4c9ff6f0795082ae18f2392d318b0fd | |
parent | a65175d452e6cb3c9c3599ab4206c42b8ab78bfd (diff) | |
download | chromium_src-754cf1378f28f3a5787bbb856b39d9fb64365a50.zip chromium_src-754cf1378f28f3a5787bbb856b39d9fb64365a50.tar.gz chromium_src-754cf1378f28f3a5787bbb856b39d9fb64365a50.tar.bz2 |
Pull new PPAPI. In particular, this converts mouse coordinates to floating point.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3135025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56304 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | webkit/glue/plugins/pepper_event_conversion.cc | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -161,7 +161,7 @@ deps = { Var("libvpx_revision"), "src/third_party/ppapi": - "http://ppapi.googlecode.com/svn/trunk@192", + "http://ppapi.googlecode.com/svn/trunk@198", "src/third_party/libjingle/source": "http://libjingle.googlecode.com/svn/branches/nextsnap@" + diff --git a/webkit/glue/plugins/pepper_event_conversion.cc b/webkit/glue/plugins/pepper_event_conversion.cc index 033ac93..99297e6 100644 --- a/webkit/glue/plugins/pepper_event_conversion.cc +++ b/webkit/glue/plugins/pepper_event_conversion.cc @@ -71,8 +71,8 @@ void BuildMouseEvent(const WebInputEvent* event, PP_Event* pp_event) { reinterpret_cast<const WebMouseEvent*>(event); pp_event->u.mouse.modifier = mouse_event->modifiers; pp_event->u.mouse.button = mouse_event->button; - pp_event->u.mouse.x = mouse_event->x; - pp_event->u.mouse.y = mouse_event->y; + pp_event->u.mouse.x = static_cast<float>(mouse_event->x); + pp_event->u.mouse.y = static_cast<float>(mouse_event->y); pp_event->u.mouse.clickCount = mouse_event->clickCount; } @@ -146,8 +146,8 @@ WebMouseEvent* BuildMouseEvent(const PP_Event& event) { mouse_event->modifiers = event.u.mouse.modifier; mouse_event->button = static_cast<WebMouseEvent::Button>(event.u.mouse.button); - mouse_event->x = event.u.mouse.x; - mouse_event->y = event.u.mouse.y; + mouse_event->x = static_cast<int>(event.u.mouse.x); + mouse_event->y = static_cast<int>(event.u.mouse.y); mouse_event->clickCount = event.u.mouse.clickCount; return mouse_event; } |