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

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

Issue 1362243002: mojo: Add proper implementation of DetachFromClient to OutputSurfaceMojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | mojo/cc/output_surface_mojo.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 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 "components/mus/public/cpp/view_surface.h" 11 #include "components/mus/public/cpp/view_surface.h"
12 #include "components/mus/public/cpp/view_surface_client.h" 12 #include "components/mus/public/cpp/view_surface_client.h"
13 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" 13 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 16
17 class OutputSurfaceMojo : public cc::OutputSurface, 17 class OutputSurfaceMojo : public cc::OutputSurface,
18 public mus::ViewSurfaceClient { 18 public mus::ViewSurfaceClient {
19 public: 19 public:
20 OutputSurfaceMojo(const scoped_refptr<cc::ContextProvider>& context_provider, 20 OutputSurfaceMojo(const scoped_refptr<cc::ContextProvider>& context_provider,
21 scoped_ptr<mus::ViewSurface> surface); 21 scoped_ptr<mus::ViewSurface> surface);
22 ~OutputSurfaceMojo() override; 22 ~OutputSurfaceMojo() override;
23 23
24 // cc::OutputSurface implementation. 24 // cc::OutputSurface implementation.
25 void SwapBuffers(cc::CompositorFrame* frame) override; 25 void SwapBuffers(cc::CompositorFrame* frame) override;
26 bool BindToClient(cc::OutputSurfaceClient* client) override; 26 bool BindToClient(cc::OutputSurfaceClient* client) override;
27 void DetachFromClient() override;
27 28
28 private: 29 private:
29 // ViewSurfaceClient implementation: 30 // ViewSurfaceClient implementation:
30 void OnResourcesReturned( 31 void OnResourcesReturned(
31 mus::ViewSurface* surface, 32 mus::ViewSurface* surface,
32 mojo::Array<mojo::ReturnedResourcePtr> resources) override; 33 mojo::Array<mojo::ReturnedResourcePtr> resources) override;
33 34
34 void SwapBuffersComplete(); 35 void SwapBuffersComplete();
35 36
36 scoped_ptr<mus::ViewSurface> surface_; 37 scoped_ptr<mus::ViewSurface> surface_;
37 38
38 DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo); 39 DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo);
39 }; 40 };
40 } 41 }
41 42
42 #endif // MOJO_CC_OUTPUT_SURFACE_MOJO_H_ 43 #endif // MOJO_CC_OUTPUT_SURFACE_MOJO_H_
OLDNEW
« no previous file with comments | « no previous file | mojo/cc/output_surface_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698