[OnionSoup] Moving VR service from content to Blink

third_party/WebKit/Source/modules/vr/VRController.cpp

 // Copyright 2015 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 "modules/vr/VRController.h"
 
 #include "core/frame/LocalFrame.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
@@ skipping 10 matching lines @@
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, supplementName(), adoptPtrWillBeNoop(controller));
 }
 
 VRController* VRController::from(LocalFrame& frame)
 {
     return static_cast<VRController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName()));
 }
 
 VRController::VRController(LocalFrame& frame, WebVRClient* client)
     : LocalFrameLifecycleObserver(&frame)
-    , m_client(client)
+    , m_client(static_cast<VRDispatcher*>(client))
 {
 }
 
 const char* VRController::supplementName()
 {
     return "VRController";
 }
 
 void VRController::getDevices(WebVRGetDevicesCallback* callback)
 {
@@ skipping 19 matching lines @@
 void VRController::resetSensor(unsigned index)
 {
     // When detached, the client is no longer valid.
     if (!m_client)
         return;
     m_client->resetSensor(index);
 }
 
 void VRController::willDetachFrameHost()
 {
     m_client = nullptr;

[haraken, 2016/03/22 02:39:20]

Not related to this CL, can we add ASSERT(!m_client) to ~VRController?

[RaviKasibhatla, 2016/03/23 15:20:50]

Done.

 }
 
 DEFINE_TRACE(VRController)
 {
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
     LocalFrameLifecycleObserver::trace(visitor);
+    visitor->trace(m_client);
 }
 
 } // namespace blink