| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ | 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ | 6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 void set_client(WindowSurfaceClient* client) { client_ = client; } | 40 void set_client(WindowSurfaceClient* client) { client_ = client; } |
| 41 | 41 |
| 42 private: | 42 private: |
| 43 friend class Window; | 43 friend class Window; |
| 44 | 44 |
| 45 WindowSurface(mojo::InterfacePtrInfo<mojom::Surface> surface_info, | 45 WindowSurface(mojo::InterfacePtrInfo<mojom::Surface> surface_info, |
| 46 mojo::InterfaceRequest<mojom::SurfaceClient> client_request); | 46 mojo::InterfaceRequest<mojom::SurfaceClient> client_request); |
| 47 | 47 |
| 48 // SurfaceClient implementation: | 48 // SurfaceClient implementation: |
| 49 void ReturnResources( | 49 void ReturnResources(mojo::Array<cc::ReturnedResource> resources) override; |
| 50 mojo::Array<mojom::ReturnedResourcePtr> resources) override; | |
| 51 | 50 |
| 52 WindowSurfaceClient* client_; | 51 WindowSurfaceClient* client_; |
| 53 mojo::InterfacePtrInfo<mojom::Surface> surface_info_; | 52 mojo::InterfacePtrInfo<mojom::Surface> surface_info_; |
| 54 mojo::InterfaceRequest<mojom::SurfaceClient> client_request_; | 53 mojo::InterfaceRequest<mojom::SurfaceClient> client_request_; |
| 55 mojom::SurfacePtr surface_; | 54 mojom::SurfacePtr surface_; |
| 56 std::unique_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_; | 55 std::unique_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_; |
| 57 std::unique_ptr<base::ThreadChecker> thread_checker_; | 56 std::unique_ptr<base::ThreadChecker> thread_checker_; |
| 58 | 57 |
| 59 DISALLOW_COPY_AND_ASSIGN(WindowSurface); | 58 DISALLOW_COPY_AND_ASSIGN(WindowSurface); |
| 60 }; | 59 }; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 76 | 75 |
| 77 mojo::InterfaceRequest<mojom::Surface> surface_request_; | 76 mojo::InterfaceRequest<mojom::Surface> surface_request_; |
| 78 mojo::InterfacePtrInfo<mojom::SurfaceClient> surface_client_; | 77 mojo::InterfacePtrInfo<mojom::SurfaceClient> surface_client_; |
| 79 | 78 |
| 80 DISALLOW_COPY_AND_ASSIGN(WindowSurfaceBinding); | 79 DISALLOW_COPY_AND_ASSIGN(WindowSurfaceBinding); |
| 81 }; | 80 }; |
| 82 | 81 |
| 83 } // namespace mus | 82 } // namespace mus |
| 84 | 83 |
| 85 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ | 84 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_ |
| OLD | NEW |