| Index: mojo/services/native_viewport/native_viewport_impl.h
|
| diff --git a/mojo/services/native_viewport/native_viewport_impl.h b/mojo/services/native_viewport/native_viewport_impl.h
|
| index b57c36a4946cf28bfdb6ca240246c69a43a4ddf9..5d26da582511aa7fa315ca3e8de507619a2016bb 100644
|
| --- a/mojo/services/native_viewport/native_viewport_impl.h
|
| +++ b/mojo/services/native_viewport/native_viewport_impl.h
|
| @@ -6,6 +6,7 @@
|
| #define MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
|
|
|
| #include "base/memory/weak_ptr.h"
|
| +#include "mojo/services/gles2/command_buffer_impl.h"
|
| #include "mojo/services/native_viewport/platform_viewport.h"
|
| #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
|
|
|
| @@ -27,6 +28,8 @@
|
| virtual void Hide() OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
| virtual void SetBounds(RectPtr bounds) OVERRIDE;
|
| + virtual void CreateGLES2Context(
|
| + InterfaceRequest<CommandBuffer> command_buffer_request) OVERRIDE;
|
|
|
| // PlatformViewport::Delegate implementation.
|
| virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE;
|
| @@ -36,11 +39,15 @@
|
| virtual void OnDestroyed() OVERRIDE;
|
|
|
| void AckEvent();
|
| + void CreateCommandBufferIfNeeded();
|
|
|
| private:
|
| + void AckDestroyed();
|
|
|
| gfx::AcceleratedWidget widget_;
|
| scoped_ptr<PlatformViewport> platform_viewport_;
|
| + InterfaceRequest<CommandBuffer> command_buffer_request_;
|
| + scoped_ptr<CommandBufferImpl> command_buffer_;
|
| bool waiting_for_event_ack_;
|
| base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
|
| };
|
|
|