Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2803)

Unified Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 22320006: Move gamepad reader code out of PepperHelperImpl in the effort to eliminate PepperHelperImpl. I'm a… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix clang Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
===================================================================
--- content/renderer/pepper/pepper_plugin_instance_impl.cc (revision 215718)
+++ content/renderer/pepper/pepper_plugin_instance_impl.cc (working copy)
@@ -419,9 +419,8 @@
error_.reset(new WebURLError(error));
}
-PepperPluginInstanceImpl::GamepadImpl::GamepadImpl(PepperHelperImpl* helper)
- : Resource(::ppapi::Resource::Untracked()),
- helper_(helper) {
+PepperPluginInstanceImpl::GamepadImpl::GamepadImpl()
+ : Resource(::ppapi::Resource::Untracked()) {
}
PepperPluginInstanceImpl::GamepadImpl::~GamepadImpl() {
@@ -435,7 +434,7 @@
PP_Instance instance,
PP_GamepadsSampleData* data) {
WebKit::WebGamepads webkit_data;
- helper_->SampleGamepads(&webkit_data);
+ RenderThreadImpl::current()->SampleGamepads(&webkit_data);
ConvertWebKitGamepadData(
*reinterpret_cast<const ::ppapi::WebKitGamepads*>(&webkit_data), data);
}
@@ -474,7 +473,7 @@
checked_for_plugin_input_event_interface_(false),
checked_for_plugin_messaging_interface_(false),
checked_for_plugin_pdf_interface_(false),
- gamepad_impl_(new GamepadImpl(helper)),
+ gamepad_impl_(new GamepadImpl()),
plugin_print_interface_(NULL),
plugin_graphics_3d_interface_(NULL),
always_on_top_(false),
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698