Allow Raw Input gamepads to persist across page refreshes

content/browser/gamepad/raw_input_data_fetcher_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gamepad/raw_input_data_fetcher_win.h"
 
 #include "base/trace_event/trace_event.h"
 #include "content/common/gamepad_hardware_buffer.h"
 #include "content/common/gamepad_messages.h"
 
@@ skipping 23 matching lines @@
 
 }   // namespace
 
 RawInputDataFetcher::RawInputDataFetcher()
     : hid_dll_(base::FilePath(FILE_PATH_LITERAL("hid.dll")))
     , rawinput_available_(GetHidDllFunctions())
     , filter_xinput_(true)
     , events_monitored_(false) {}
 
 RawInputDataFetcher::~RawInputDataFetcher() {
+  ClearControllers();
   DCHECK(!window_);
   DCHECK(!events_monitored_);
 }
 
 void RawInputDataFetcher::WillDestroyCurrentMessageLoop() {
   StopMonitor();
 }
 
 RAWINPUTDEVICE* RawInputDataFetcher::GetRawInputDevices(DWORD flags) {
   int usage_count = arraysize(DeviceUsages);
   scoped_ptr<RAWINPUTDEVICE[]> devices(new RAWINPUTDEVICE[usage_count]);
   for (int i = 0; i < usage_count; ++i) {
     devices[i].dwFlags = flags;
     devices[i].usUsagePage = 1;
     devices[i].usUsage = DeviceUsages[i];
-    devices[i].hwndTarget = window_->hwnd();
+    devices[i].hwndTarget = (flags & RIDEV_REMOVE) ? 0 : window_->hwnd();
   }
   return devices.release();
 }
 
 void RawInputDataFetcher::StartMonitor() {
   if (!rawinput_available_ || events_monitored_)
     return;
 
   if (!window_) {
     window_.reset(new base::win::MessageWindow());
@@ skipping 30 matching lines @@
   DCHECK(window_);
   scoped_ptr<RAWINPUTDEVICE[]> devices(GetRawInputDevices(RIDEV_REMOVE));
 
   if (!RegisterRawInputDevices(devices.get(), arraysize(DeviceUsages),
       sizeof(RAWINPUTDEVICE))) {
     PLOG(INFO) << "RegisterRawInputDevices() failed for RIDEV_REMOVE";
   }
 
   events_monitored_ = false;
   window_.reset();
-  ClearControllers();
 
   // Stop observing message loop destruction if no event is being monitored.
   base::MessageLoop::current()->RemoveDestructionObserver(this);
 }
 
 void RawInputDataFetcher::ClearControllers() {
   while (!controllers_.empty()) {
     RawGamepadInfo* gamepad_info = controllers_.begin()->second;
     controllers_.erase(gamepad_info->handle);
     delete gamepad_info;
@@ skipping 383 matching lines @@
     return false;
   hidd_get_product_string_ = reinterpret_cast<HidDGetStringFunc>(
       hid_dll_.GetFunctionPointer("HidD_GetProductString"));
   if (!hidd_get_product_string_)
     return false;
 
   return true;
 }
 
 }  // namespace content