Refactored VRService interaction and added VRServiceClient

third_party/WebKit/Source/modules/vr/NavigatorVR.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/NavigatorVR.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/page/Page.h"
 #include "modules/vr/VRController.h"
 #include "modules/vr/VRDisplay.h"
-#include "modules/vr/VRDisplayCollection.h"
 #include "modules/vr/VRGetDevicesCallback.h"
 #include "modules/vr/VRPose.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
 NavigatorVR* NavigatorVR::from(Document& document)
 {
     if (!document.frame() || !document.frame()->domWindow())
         return 0;
@@ skipping 22 matching lines @@
     ScriptPromise promise = resolver->promise();
 
     Document* document = m_frame ? m_frame->document() : 0;
 
     if (!document || !controller()) {
         DOMException* exception = DOMException::create(InvalidStateError, "The object is no longer associated to a document.");
         resolver->reject(exception);
         return promise;
     }
 
-    controller()->getDisplays(WTF::wrapUnique(new VRGetDevicesCallback(resolver, m_displays.get())));
+    controller()->getDisplays(resolver);
 
     return promise;
 }
 
 VRController* NavigatorVR::controller()
 {
     if (!frame())
         return 0;
 
-    return VRController::from(*frame());
+    if (!m_controller) {
+        m_controller = new VRController(this);
+    }
+
+    return m_controller;
 }
 
 Document* NavigatorVR::document()
 {
     return m_frame ? m_frame->document() : 0;
 }
 
 DEFINE_TRACE(NavigatorVR)
 {
-    visitor->trace(m_displays);
+    visitor->trace(m_controller);
 
     Supplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 NavigatorVR::NavigatorVR(LocalFrame* frame)
     : DOMWindowProperty(frame)
 {
-    m_displays = new VRDisplayCollection(this);
 }
 
 NavigatorVR::~NavigatorVR()
 {
 }
 
 const char* NavigatorVR::supplementName()
 {
     return "NavigatorVR";
 }
 
 } // namespace blink