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

Side by Side Diff: mojo/cc/output_surface_mojo.h

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 5 years, 11 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_CC_OUTPUT_SURFACE_MOJO_H_ 5 #ifndef MOJO_CC_OUTPUT_SURFACE_MOJO_H_
6 #define MOJO_CC_OUTPUT_SURFACE_MOJO_H_ 6 #define MOJO_CC_OUTPUT_SURFACE_MOJO_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "cc/output/output_surface.h" 9 #include "cc/output/output_surface.h"
10 #include "cc/surfaces/surface_id.h" 10 #include "cc/surfaces/surface_id.h"
11 #include "cc/surfaces/surface_id_allocator.h" 11 #include "cc/surfaces/surface_id_allocator.h"
12 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h" 12 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
13 13
14 namespace mojo { 14 namespace mojo {
15 15
16 class OutputSurfaceMojoClient { 16 class OutputSurfaceMojoClient {
17 public: 17 public:
18 virtual ~OutputSurfaceMojoClient() {} 18 virtual ~OutputSurfaceMojoClient() {}
19 19
20 virtual void DidCreateSurface(cc::SurfaceId id) = 0; 20 virtual void DidCreateSurface(cc::SurfaceId id) = 0;
21 }; 21 };
22 22
23 class OutputSurfaceMojo : public cc::OutputSurface, public SurfaceClient { 23 class OutputSurfaceMojo : public cc::OutputSurface, public SurfaceClient {
24 public: 24 public:
25 OutputSurfaceMojo(OutputSurfaceMojoClient* client, 25 OutputSurfaceMojo(OutputSurfaceMojoClient* client,
26 const scoped_refptr<cc::ContextProvider>& context_provider, 26 const scoped_refptr<cc::ContextProvider>& context_provider,
27 SurfacePtr surface, 27 SurfacePtr surface,
28 uint32_t id_namespace); 28 uint32_t id_namespace);
29 29
30 // SurfaceClient implementation.
31 void ReturnResources(Array<ReturnedResourcePtr> resources) override;
32
33 // cc::OutputSurface implementation. 30 // cc::OutputSurface implementation.
34 void SwapBuffers(cc::CompositorFrame* frame) override; 31 void SwapBuffers(cc::CompositorFrame* frame) override;
35 bool BindToClient(cc::OutputSurfaceClient* client) override; 32 bool BindToClient(cc::OutputSurfaceClient* client) override;
36 33
37 protected: 34 protected:
38 ~OutputSurfaceMojo() override; 35 ~OutputSurfaceMojo() override;
39 36
40 private: 37 private:
38 // SurfaceClient implementation.
39 void SetIdNamespace(uint32_t id_namespace) override;
40 void ReturnResources(Array<ReturnedResourcePtr> resources) override;
41
41 OutputSurfaceMojoClient* output_surface_mojo_client_; 42 OutputSurfaceMojoClient* output_surface_mojo_client_;
42 SurfacePtr surface_; 43 SurfacePtr surface_;
43 cc::SurfaceIdAllocator id_allocator_; 44 cc::SurfaceIdAllocator id_allocator_;
44 cc::SurfaceId surface_id_; 45 cc::SurfaceId surface_id_;
45 gfx::Size surface_size_; 46 gfx::Size surface_size_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo); 48 DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo);
48 }; 49 };
49 } 50 }
50 51
51 #endif // MOJO_CC_OUTPUT_SURFACE_MOJO_H_ 52 #endif // MOJO_CC_OUTPUT_SURFACE_MOJO_H_
OLDNEW
« no previous file with comments | « mojo/android/system/src/org/chromium/mojo/system/impl/HandleBase.java ('k') | mojo/cc/output_surface_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698