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

Side by Side Diff: mojo/services/surfaces/surfaces_impl.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SURFACES_SURFACES_IMPL_H_ 5 #ifndef MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
6 #define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_ 6 #define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
7 7
8 #include "base/compiler_specific.h"
9 #include "cc/surfaces/display_client.h" 8 #include "cc/surfaces/display_client.h"
10 #include "cc/surfaces/surface_factory.h" 9 #include "cc/surfaces/surface_factory.h"
11 #include "cc/surfaces/surface_factory_client.h" 10 #include "cc/surfaces/surface_factory_client.h"
12 #include "mojo/public/cpp/application/application_connection.h" 11 #include "mojo/public/cpp/application/application_connection.h"
13 #include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h" 12 #include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
14 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h" 13 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
15 14
16 namespace cc { 15 namespace cc {
17 class Display; 16 class Display;
18 } 17 }
(...skipping 12 matching lines...) Expand all
31 virtual void FrameSubmitted() = 0; 30 virtual void FrameSubmitted() = 0;
32 virtual void SetDisplay(cc::Display*) = 0; 31 virtual void SetDisplay(cc::Display*) = 0;
33 }; 32 };
34 33
35 SurfacesImpl(cc::SurfaceManager* manager, 34 SurfacesImpl(cc::SurfaceManager* manager,
36 uint32_t id_namespace, 35 uint32_t id_namespace,
37 Client* client); 36 Client* client);
38 virtual ~SurfacesImpl(); 37 virtual ~SurfacesImpl();
39 38
40 // Surface implementation. 39 // Surface implementation.
41 virtual void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) OVERRIDE; 40 virtual void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) override;
42 virtual void SubmitFrame(SurfaceIdPtr id, FramePtr frame) OVERRIDE; 41 virtual void SubmitFrame(SurfaceIdPtr id, FramePtr frame) override;
43 virtual void DestroySurface(SurfaceIdPtr id) OVERRIDE; 42 virtual void DestroySurface(SurfaceIdPtr id) override;
44 virtual void CreateGLES2BoundSurface(CommandBufferPtr gles2_client, 43 virtual void CreateGLES2BoundSurface(CommandBufferPtr gles2_client,
45 SurfaceIdPtr id, 44 SurfaceIdPtr id,
46 mojo::SizePtr size) OVERRIDE; 45 mojo::SizePtr size) override;
47 46
48 // SurfaceFactoryClient implementation. 47 // SurfaceFactoryClient implementation.
49 virtual void ReturnResources( 48 virtual void ReturnResources(
50 const cc::ReturnedResourceArray& resources) OVERRIDE; 49 const cc::ReturnedResourceArray& resources) override;
51 50
52 // DisplayClient implementation. 51 // DisplayClient implementation.
53 virtual void DisplayDamaged() OVERRIDE; 52 virtual void DisplayDamaged() override;
54 virtual void DidSwapBuffers() OVERRIDE; 53 virtual void DidSwapBuffers() override;
55 virtual void DidSwapBuffersComplete() OVERRIDE; 54 virtual void DidSwapBuffersComplete() override;
56 virtual void CommitVSyncParameters(base::TimeTicks timebase, 55 virtual void CommitVSyncParameters(base::TimeTicks timebase,
57 base::TimeDelta interval) OVERRIDE; 56 base::TimeDelta interval) override;
58 virtual void OutputSurfaceLost() OVERRIDE; 57 virtual void OutputSurfaceLost() override;
59 virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) OVERRIDE; 58 virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
60 59
61 cc::SurfaceFactory* factory() { return &factory_; } 60 cc::SurfaceFactory* factory() { return &factory_; }
62 61
63 private: 62 private:
64 cc::SurfaceManager* manager_; 63 cc::SurfaceManager* manager_;
65 cc::SurfaceFactory factory_; 64 cc::SurfaceFactory factory_;
66 uint32_t id_namespace_; 65 uint32_t id_namespace_;
67 Client* client_; 66 Client* client_;
68 scoped_ptr<cc::Display> display_; 67 scoped_ptr<cc::Display> display_;
69 ScopedMessagePipeHandle command_buffer_handle_; 68 ScopedMessagePipeHandle command_buffer_handle_;
70 69
71 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl); 70 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);
72 }; 71 };
73 72
74 } // namespace mojo 73 } // namespace mojo
75 74
76 #endif // MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_ 75 #endif // MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/public/cpp/view_manager/tests/view_unittest.cc ('k') | mojo/services/surfaces/surfaces_service_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698