Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(657)

Side by Side Diff: mojo/services/gles2/command_buffer_impl.h

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/services/clipboard/main.cc ('k') | mojo/services/gles2/command_buffer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ 5 #ifndef MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
6 #define MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ 6 #define MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
10 #include "mojo/public/cpp/system/core.h" 11 #include "mojo/public/cpp/system/core.h"
11 #include "mojo/services/gles2/command_buffer.mojom.h" 12 #include "mojo/services/gles2/command_buffer.mojom.h"
12 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
13 #include "ui/gfx/size.h" 14 #include "ui/gfx/size.h"
14 15
15 namespace gpu { 16 namespace gpu {
16 class CommandBufferService; 17 class CommandBufferService;
17 class GpuScheduler; 18 class GpuScheduler;
(...skipping 18 matching lines...) Expand all
36 CommandBufferImpl(gfx::GLShareGroup* share_group, 37 CommandBufferImpl(gfx::GLShareGroup* share_group,
37 gpu::gles2::MailboxManager* mailbox_manager); 38 gpu::gles2::MailboxManager* mailbox_manager);
38 // Onscreen. 39 // Onscreen.
39 CommandBufferImpl(gfx::AcceleratedWidget widget, 40 CommandBufferImpl(gfx::AcceleratedWidget widget,
40 const gfx::Size& size, 41 const gfx::Size& size,
41 gfx::GLShareGroup* share_group, 42 gfx::GLShareGroup* share_group,
42 gpu::gles2::MailboxManager* mailbox_manager); 43 gpu::gles2::MailboxManager* mailbox_manager);
43 virtual ~CommandBufferImpl(); 44 virtual ~CommandBufferImpl();
44 45
45 virtual void Initialize(CommandBufferSyncClientPtr sync_client, 46 virtual void Initialize(CommandBufferSyncClientPtr sync_client,
46 mojo::ScopedSharedBufferHandle shared_state) OVERRIDE; 47 mojo::ScopedSharedBufferHandle shared_state) override;
47 virtual void SetGetBuffer(int32_t buffer) OVERRIDE; 48 virtual void SetGetBuffer(int32_t buffer) override;
48 virtual void Flush(int32_t put_offset) OVERRIDE; 49 virtual void Flush(int32_t put_offset) override;
49 virtual void MakeProgress(int32_t last_get_offset) OVERRIDE; 50 virtual void MakeProgress(int32_t last_get_offset) override;
50 virtual void RegisterTransferBuffer( 51 virtual void RegisterTransferBuffer(
51 int32_t id, 52 int32_t id,
52 mojo::ScopedSharedBufferHandle transfer_buffer, 53 mojo::ScopedSharedBufferHandle transfer_buffer,
53 uint32_t size) OVERRIDE; 54 uint32_t size) override;
54 virtual void DestroyTransferBuffer(int32_t id) OVERRIDE; 55 virtual void DestroyTransferBuffer(int32_t id) override;
55 virtual void Echo(const Callback<void()>& callback) OVERRIDE; 56 virtual void Echo(const Callback<void()>& callback) override;
56 57
57 private: 58 private:
58 bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state); 59 bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state);
59 60
60 void OnResize(gfx::Size size, float scale_factor); 61 void OnResize(gfx::Size size, float scale_factor);
61 62
62 void OnParseError(); 63 void OnParseError();
63 64
64 CommandBufferSyncClientPtr sync_client_; 65 CommandBufferSyncClientPtr sync_client_;
65 66
66 gfx::AcceleratedWidget widget_; 67 gfx::AcceleratedWidget widget_;
67 gfx::Size size_; 68 gfx::Size size_;
68 scoped_ptr<gpu::CommandBufferService> command_buffer_; 69 scoped_ptr<gpu::CommandBufferService> command_buffer_;
69 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 70 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
70 scoped_ptr<gpu::GpuScheduler> scheduler_; 71 scoped_ptr<gpu::GpuScheduler> scheduler_;
71 scoped_refptr<gfx::GLContext> context_; 72 scoped_refptr<gfx::GLContext> context_;
72 scoped_refptr<gfx::GLSurface> surface_; 73 scoped_refptr<gfx::GLSurface> surface_;
73 scoped_refptr<gfx::GLShareGroup> share_group_; 74 scoped_refptr<gfx::GLShareGroup> share_group_;
74 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_; 75 scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
75 76
76 DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl); 77 DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl);
77 }; 78 };
78 79
79 } // namespace mojo 80 } // namespace mojo
80 81
81 #endif // MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_ 82 #endif // MOJO_SERVICES_GLES2_COMMAND_BUFFER_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/clipboard/main.cc ('k') | mojo/services/gles2/command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698