Chromium Code Reviews| Index: third_party/WebKit/Source/modules/vr/VRDisplay.h |
| diff --git a/third_party/WebKit/Source/modules/vr/VRDisplay.h b/third_party/WebKit/Source/modules/vr/VRDisplay.h |
| index 7daad3ced56268b92c0d5111deec5976587d4639..718717312ea0253b7f214683bf86c86559103473 100644 |
| --- a/third_party/WebKit/Source/modules/vr/VRDisplay.h |
| +++ b/third_party/WebKit/Source/modules/vr/VRDisplay.h |
| @@ -5,9 +5,10 @@ |
| #ifndef VRDisplay_h |
| #define VRDisplay_h |
| -#include "bindings/core/v8/ScriptWrappable.h" |
| +#include "core/dom/ActiveDOMObject.h" |
| #include "core/dom/Document.h" |
| #include "core/dom/FrameRequestCallback.h" |
| +#include "core/events/EventTarget.h" |
| #include "device/vr/vr_service.mojom-blink.h" |
| #include "modules/vr/VRDisplayCapabilities.h" |
| #include "modules/vr/VRLayer.h" |
| @@ -38,10 +39,12 @@ class WebGLRenderingContextBase; |
| enum VREye { VREyeNone, VREyeLeft, VREyeRight }; |
| -class VRDisplay final : public GarbageCollectedFinalized<VRDisplay>, |
| - public device::mojom::blink::VRDisplayClient, |
| - public ScriptWrappable { |
| +class VRDisplay final : public EventTargetWithInlineData, |
| + public ActiveScriptWrappable, |
| + public ActiveDOMObject, |
| + public device::mojom::blink::VRDisplayClient { |
| DEFINE_WRAPPERTYPEINFO(); |
| + USING_GARBAGE_COLLECTED_MIXIN(VRDisplay); |
| USING_PRE_FINALIZER(VRDisplay, dispose); |
| public: |
| @@ -79,6 +82,18 @@ class VRDisplay final : public GarbageCollectedFinalized<VRDisplay>, |
| void submitFrame(); |
| + // EventTarget overrides: |
| + ExecutionContext* getExecutionContext() const override; |
| + const AtomicString& interfaceName() const override; |
| + |
| + // ActiveDOMObject implementation. |
| + void suspend() override; |
| + void resume() override; |
|
haraken
2016/11/29 01:43:28
Do you really want to implement suspend/resume? Ot
|
| + void contextDestroyed() override; |
| + |
| + // ScriptWrappable implementation. |
| + bool hasPendingActivity() const final; |
| + |
| DECLARE_VIRTUAL_TRACE(); |
| protected: |