| OLD | NEW |
| 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 #include "cc/surfaces/direct_compositor_frame_sink.h" | 5 #include "cc/surfaces/direct_compositor_frame_sink.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
| 9 #include "cc/output/compositor_frame_sink_client.h" | 9 #include "cc/output/compositor_frame_sink_client.h" |
| 10 #include "cc/surfaces/display.h" | 10 #include "cc/surfaces/display.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 // Avoid initializing GL context here, as this should be sharing the | 73 // Avoid initializing GL context here, as this should be sharing the |
| 74 // Display's context. | 74 // Display's context. |
| 75 display_->Initialize(this, surface_manager_, | 75 display_->Initialize(this, surface_manager_, |
| 76 surface_id_allocator_->client_id()); | 76 surface_id_allocator_->client_id()); |
| 77 return true; | 77 return true; |
| 78 } | 78 } |
| 79 | 79 |
| 80 void DirectCompositorFrameSink::DetachFromClient() { | 80 void DirectCompositorFrameSink::DetachFromClient() { |
| 81 DCHECK(HasClient()); | 81 DCHECK(HasClient()); |
| 82 |
| 82 // Unregister the SurfaceFactoryClient here instead of the dtor so that only | 83 // Unregister the SurfaceFactoryClient here instead of the dtor so that only |
| 83 // one client is alive for this namespace at any given time. | 84 // one client is alive for this namespace at any given time. |
| 84 surface_manager_->UnregisterSurfaceFactoryClient( | 85 surface_manager_->UnregisterSurfaceFactoryClient( |
| 85 surface_id_allocator_->client_id()); | 86 surface_id_allocator_->client_id()); |
| 86 if (!delegated_surface_id_.is_null()) | 87 if (!delegated_surface_id_.is_null()) |
| 87 factory_.Destroy(delegated_surface_id_); | 88 factory_.Destroy(delegated_surface_id_); |
| 88 | 89 |
| 89 CompositorFrameSink::DetachFromClient(); | 90 CompositorFrameSink::DetachFromClient(); |
| 90 } | 91 } |
| 91 | 92 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 // This notification is not relevant to our client outside of tests. | 140 // This notification is not relevant to our client outside of tests. |
| 140 } | 141 } |
| 141 | 142 |
| 142 void DirectCompositorFrameSink::DisplayDidDrawAndSwap() { | 143 void DirectCompositorFrameSink::DisplayDidDrawAndSwap() { |
| 143 // This notification is not relevant to our client outside of tests. We | 144 // This notification is not relevant to our client outside of tests. We |
| 144 // unblock the client from DidDrawCallback() when the surface is going to | 145 // unblock the client from DidDrawCallback() when the surface is going to |
| 145 // be drawn. | 146 // be drawn. |
| 146 } | 147 } |
| 147 | 148 |
| 148 void DirectCompositorFrameSink::DidDrawCallback() { | 149 void DirectCompositorFrameSink::DidDrawCallback() { |
| 149 // TODO(danakj): Why the lost check? | 150 CompositorFrameSink::PostSwapBuffersComplete(); |
| 150 if (!is_lost_) | |
| 151 client_->DidSwapBuffersComplete(); | |
| 152 } | 151 } |
| 153 | 152 |
| 154 } // namespace cc | 153 } // namespace cc |
| OLD | NEW |