Chromium Code Reviews| Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc |
| diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
| index c5c52ce97211af179508da09e0b22b5bb5fe4db9..8128678eb9c7b5b35718d2db57835b738978e958 100644 |
| --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
| +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc |
| @@ -14,6 +14,7 @@ |
| #include "base/utf_string_conversions.h" |
| #include "ppapi/c/dev/ppb_console_dev.h" |
| #include "ppapi/c/dev/ppb_find_dev.h" |
| +#include "ppapi/c/dev/ppb_gamepad_dev.h" |
| #include "ppapi/c/dev/ppb_zoom_dev.h" |
| #include "ppapi/c/dev/ppp_find_dev.h" |
| #include "ppapi/c/dev/ppp_selection_dev.h" |
| @@ -45,6 +46,7 @@ |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
| @@ -1300,6 +1302,11 @@ int32_t PluginInstance::Navigate(PPB_URLRequestInfo_Impl* request, |
| return PP_OK; |
| } |
| +void PluginInstance::SampleGamepads(PP_Instance instance, |
| + PP_GamepadsData_Dev* data) { |
| + delegate()->SampleGamepads(reinterpret_cast<WebKit::WebGamepads*>(data)); |
|
brettw
2012/01/05 22:50:04
We should have some compiler asserts about the siz
scottmg
2012/01/06 00:54:21
Done. Had to be DCHECK per comments & irc.
|
| +} |
| + |
| bool PluginInstance::IsViewAccelerated() { |
| if (!container_) |
| return false; |