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

Unified Diff: content/renderer/gamepad_shared_memory_reader.h

Issue 470683002: Revert "Refactor code listening to platform events in content/renderer/." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: content/renderer/gamepad_shared_memory_reader.h
diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h
index d62f88131250c019c656b18dca497ab24712cc0f..eb63867612c034de090fc6052e4a04aff61501ec 100644
--- a/content/renderer/gamepad_shared_memory_reader.h
+++ b/content/renderer/gamepad_shared_memory_reader.h
@@ -8,40 +8,46 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "content/common/gamepad_messages.h"
+#include "content/public/renderer/render_process_observer.h"
#include "content/public/renderer/renderer_gamepad_provider.h"
#include "third_party/WebKit/public/platform/WebGamepads.h"
namespace content {
struct GamepadHardwareBuffer;
+class RendererWebKitPlatformSupportImpl;
-class GamepadSharedMemoryReader : public RendererGamepadProvider {
+class GamepadSharedMemoryReader
+ : public RenderProcessObserver,
+ public RendererGamepadProvider {
public:
- explicit GamepadSharedMemoryReader(RenderThread* thread);
+ GamepadSharedMemoryReader(
+ RendererWebKitPlatformSupportImpl* webkit_platform_support);
virtual ~GamepadSharedMemoryReader();
// RendererGamepadProvider implementation.
virtual void SampleGamepads(
blink::WebGamepads& gamepads) OVERRIDE;
- virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void Start(blink::WebPlatformEventListener* listener) OVERRIDE;
+ virtual void SetGamepadListener(
+ blink::WebGamepadListener* listener) OVERRIDE;
- protected:
- // PlatformEventObserver protected methods.
- virtual void SendStartMessage() OVERRIDE;
- virtual void SendStopMessage() OVERRIDE;
+ // RenderProcessObserver implementation.
+ virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
private:
void OnGamepadConnected(int index, const blink::WebGamepad& gamepad);
void OnGamepadDisconnected(int index, const blink::WebGamepad& gamepad);
+ void StartPollingIfNecessary();
+ void StopPollingIfNecessary();
+
base::SharedMemoryHandle renderer_shared_memory_handle_;
scoped_ptr<base::SharedMemory> renderer_shared_memory_;
GamepadHardwareBuffer* gamepad_hardware_buffer_;
+ blink::WebGamepadListener* gamepad_listener_;
+ bool is_polling_;
bool ever_interacted_with_;
-
- DISALLOW_COPY_AND_ASSIGN(GamepadSharedMemoryReader);
};
} // namespace content
« no previous file with comments | « content/renderer/device_sensors/device_sensor_event_pump.cc ('k') | content/renderer/gamepad_shared_memory_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698