mojo VR interface simplified

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

Index: third_party/WebKit/Source/modules/vr/VRController.h
diff --git a/third_party/WebKit/Source/modules/vr/VRController.h b/third_party/WebKit/Source/modules/vr/VRController.h
index 9c8b5b85f09bbc8588cff718159b02d1ab312247..37ef82acf826a4a604341cbf8dc7fd0fcc344af9 100644
--- a/third_party/WebKit/Source/modules/vr/VRController.h
+++ b/third_party/WebKit/Source/modules/vr/VRController.h
@@ -21,44 +21,26 @@ class NavigatorVR;
 class VRGetDevicesCallback;
 
 class VRController final : public GarbageCollectedFinalized<VRController>,
-                           public device::blink::VRServiceClient,
+                           public device::mojom::blink::VRServiceClient,
                            public ContextLifecycleObserver {
   USING_GARBAGE_COLLECTED_MIXIN(VRController);
   WTF_MAKE_NONCOPYABLE(VRController);
+  USING_PRE_FINALIZER(VRController, contextDestroyed);

[haraken, 2016/11/02 08:25:11]

It's a bit strange to register a function address of an overridden method
somewhere. So I'd prefer adding a helper method like dispose() and register it
to the pre-finalizer. contextDestroyed() can just call dispose().

[shaobo.yan, 2016/11/02 09:22:38]

Done.

 
  public:
   VRController(NavigatorVR*);
   virtual ~VRController();
 
-  // VRService.
   void getDisplays(ScriptPromiseResolver*);
-  device::blink::VRPosePtr getPose(unsigned index);
-  void resetPose(unsigned index);
-  void requestPresent(ScriptPromiseResolver*,
-                      unsigned index,
-                      bool secureOrigin);
-  void exitPresent(unsigned index);
-  void submitFrame(unsigned index, device::blink::VRPosePtr);
-  void updateLayerBounds(unsigned index,
-                         device::blink::VRLayerBoundsPtr leftBounds,
-                         device::blink::VRLayerBoundsPtr rightBounds);
-
-  VRDisplay* createOrUpdateDisplay(const device::blink::VRDisplayPtr&);
-  VRDisplayVector updateDisplays(mojo::WTFArray<device::blink::VRDisplayPtr>);
-  VRDisplay* getDisplayForIndex(unsigned index);
+
+  void OnDisplayConnected(device::mojom::blink::VRDisplayPtr,
+                          device::mojom::blink::VRDisplayInfoPtr) override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  // Binding callbacks.
-  void onGetDisplays(mojo::WTFArray<device::blink::VRDisplayPtr>);
-  void onPresentComplete(ScriptPromiseResolver*, unsigned index, bool success);
-
-  // VRServiceClient.
-  void OnDisplayChanged(device::blink::VRDisplayPtr) override;
-  void OnExitPresent(unsigned index) override;
-  void OnDisplayConnected(device::blink::VRDisplayPtr) override;
-  void OnDisplayDisconnected(unsigned) override;
+  void onDisplaysSynced(unsigned);
+  void onGetDisplays();
 
   // ContextLifecycleObserver.
   void contextDestroyed() override;
@@ -66,9 +48,12 @@ class VRController final : public GarbageCollectedFinalized<VRController>,
   Member<NavigatorVR> m_navigatorVR;
   VRDisplayVector m_displays;
 
+  bool m_displaySynced;
+  unsigned m_displaysSyncedNum;
+
   Deque<std::unique_ptr<VRGetDevicesCallback>> m_pendingGetDevicesCallbacks;
-  device::blink::VRServicePtr m_service;
-  mojo::Binding<device::blink::VRServiceClient> m_binding;
+  device::mojom::blink::VRServicePtr m_service;
+  mojo::Binding<device::mojom::blink::VRServiceClient> m_binding;
 };
 
 }  // namespace blink