| 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_WS_SERVER_WINDOW_SURFACE_H_ | 5 #ifndef COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_ |
| 6 #define COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_ | 6 #define COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 void RegisterForBeginFrames(); | 63 void RegisterForBeginFrames(); |
| 64 | 64 |
| 65 private: | 65 private: |
| 66 ServerWindow* window(); | 66 ServerWindow* window(); |
| 67 | 67 |
| 68 // Takes a mojom::CompositorFrame |input|, and converts it into a | 68 // Takes a mojom::CompositorFrame |input|, and converts it into a |
| 69 // cc::CompositorFrame. Along the way, this conversion ensures that a | 69 // cc::CompositorFrame. Along the way, this conversion ensures that a |
| 70 // CompositorFrame of this window can only refer to windows within its | 70 // CompositorFrame of this window can only refer to windows within its |
| 71 // subtree. Windows referenced in |input| are stored in | 71 // subtree. Windows referenced in |input| are stored in |
| 72 // |referenced_window_ids_|. | 72 // |referenced_window_ids_|. |
| 73 scoped_ptr<cc::CompositorFrame> ConvertCompositorFrame( | 73 std::unique_ptr<cc::CompositorFrame> ConvertCompositorFrame( |
| 74 const mojom::CompositorFramePtr& input); | 74 const mojom::CompositorFramePtr& input); |
| 75 | 75 |
| 76 // Overriden from CustomSurfaceConverter: | 76 // Overriden from CustomSurfaceConverter: |
| 77 bool ConvertSurfaceDrawQuad(const mojom::QuadPtr& input, | 77 bool ConvertSurfaceDrawQuad(const mojom::QuadPtr& input, |
| 78 const mojom::CompositorFrameMetadataPtr& metadata, | 78 const mojom::CompositorFrameMetadataPtr& metadata, |
| 79 cc::SharedQuadState* sqs, | 79 cc::SharedQuadState* sqs, |
| 80 cc::RenderPass* render_pass) override; | 80 cc::RenderPass* render_pass) override; |
| 81 | 81 |
| 82 // SurfaceFactoryClient implementation. | 82 // SurfaceFactoryClient implementation. |
| 83 void ReturnResources(const cc::ReturnedResourceArray& resources) override; | 83 void ReturnResources(const cc::ReturnedResourceArray& resources) override; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 103 bool registered_surface_factory_client_; | 103 bool registered_surface_factory_client_; |
| 104 | 104 |
| 105 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface); | 105 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace ws | 108 } // namespace ws |
| 109 | 109 |
| 110 } // namespace mus | 110 } // namespace mus |
| 111 | 111 |
| 112 #endif // COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_ | 112 #endif // COMPONENTS_MUS_WS_SERVER_WINDOW_SURFACE_H_ |
| OLD | NEW |