summaryrefslogtreecommitdiffstats
path: root/ppapi/thunk
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 05:49:26 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 05:49:26 +0000
commita549359b293776b642fd7303bfcc469b3bfe7fa5 (patch)
tree0d2a323a04934964614030b677e35303234ae98e /ppapi/thunk
parent15808d130f00e0545cf0f31fedfdd6669c8a2517 (diff)
downloadchromium_src-a549359b293776b642fd7303bfcc469b3bfe7fa5.zip
chromium_src-a549359b293776b642fd7303bfcc469b3bfe7fa5.tar.gz
chromium_src-a549359b293776b642fd7303bfcc469b3bfe7fa5.tar.bz2
ppapi: Make sure the touch-event interface is detected correctly.
BUG=145235 Review URL: https://chromiumcodereview.appspot.com/10873074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
-rw-r--r--ppapi/thunk/interfaces_ppb_public_stable.h2
-rw-r--r--ppapi/thunk/ppb_input_event_thunk.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index 81ce890..635cb3a 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -67,6 +67,8 @@ PROXIED_IFACE(NoAPIName, PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1,
PPB_MouseInputEvent_1_1)
PROXIED_IFACE(NoAPIName, PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0,
PPB_WheelInputEvent_1_0)
+PROXIED_IFACE(NoAPIName, PPB_TOUCH_INPUT_EVENT_INTERFACE_1_0,
+ PPB_TouchInputEvent_1_0)
PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0)
PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0)
PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0)
diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc
index 27a7027..4efbc188 100644
--- a/ppapi/thunk/ppb_input_event_thunk.cc
+++ b/ppapi/thunk/ppb_input_event_thunk.cc
@@ -480,7 +480,7 @@ const PPB_IMEInputEvent_Dev_0_2* GetPPB_IMEInputEvent_Dev_0_2_Thunk() {
return &g_ppb_ime_input_event_0_2_thunk;
}
-const PPB_TouchInputEvent_1_0* GetPPB_TouchInputEvent_Thunk() {
+const PPB_TouchInputEvent_1_0* GetPPB_TouchInputEvent_1_0_Thunk() {
return &g_ppb_touch_input_event_thunk;
}