| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/gpu/compositor_output_surface.h" | 5 #include "content/renderer/gpu/compositor_output_surface.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 if (!HasClient()) | 96 if (!HasClient()) |
| 97 return; | 97 return; |
| 98 if (output_surface_proxy_) { | 98 if (output_surface_proxy_) { |
| 99 output_surface_proxy_->ClearOutputSurface(); | 99 output_surface_proxy_->ClearOutputSurface(); |
| 100 output_surface_filter_->RemoveHandlerOnCompositorThread( | 100 output_surface_filter_->RemoveHandlerOnCompositorThread( |
| 101 routing_id_, output_surface_filter_handler_); | 101 routing_id_, output_surface_filter_handler_); |
| 102 } | 102 } |
| 103 cc::OutputSurface::DetachFromClient(); | 103 cc::OutputSurface::DetachFromClient(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) { | 106 void CompositorOutputSurface::SwapBuffers( |
| 107 std::unique_ptr<cc::CompositorFrame> frame) { |
| 107 { | 108 { |
| 108 std::unique_ptr<FrameSwapMessageQueue::SendMessageScope> | 109 std::unique_ptr<FrameSwapMessageQueue::SendMessageScope> |
| 109 send_message_scope = | 110 send_message_scope = |
| 110 frame_swap_message_queue_->AcquireSendMessageScope(); | 111 frame_swap_message_queue_->AcquireSendMessageScope(); |
| 111 std::vector<std::unique_ptr<IPC::Message>> messages; | 112 std::vector<std::unique_ptr<IPC::Message>> messages; |
| 112 std::vector<IPC::Message> messages_to_deliver_with_frame; | 113 std::vector<IPC::Message> messages_to_deliver_with_frame; |
| 113 frame_swap_message_queue_->DrainMessages(&messages); | 114 frame_swap_message_queue_->DrainMessages(&messages); |
| 114 FrameSwapMessageQueue::TransferMessages(&messages, | 115 FrameSwapMessageQueue::TransferMessages(&messages, |
| 115 &messages_to_deliver_with_frame); | 116 &messages_to_deliver_with_frame); |
| 116 Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, output_surface_id_, | 117 Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, output_surface_id_, |
| 117 *frame, | 118 frame, |
| 118 messages_to_deliver_with_frame)); | 119 messages_to_deliver_with_frame)); |
| 119 // ~send_message_scope. | 120 // ~send_message_scope. |
| 120 } | 121 } |
| 121 client_->DidSwapBuffers(); | 122 client_->DidSwapBuffers(); |
| 122 } | 123 } |
| 123 | 124 |
| 124 void CompositorOutputSurface::BindFramebuffer() { | 125 void CompositorOutputSurface::BindFramebuffer() { |
| 125 // This is a delegating output surface, no framebuffer/direct drawing support. | 126 // This is a delegating output surface, no framebuffer/direct drawing support. |
| 126 NOTREACHED(); | 127 NOTREACHED(); |
| 127 } | 128 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 if (output_surface_id != output_surface_id_) | 174 if (output_surface_id != output_surface_id_) |
| 174 return; | 175 return; |
| 175 ReclaimResources(&ack); | 176 ReclaimResources(&ack); |
| 176 } | 177 } |
| 177 | 178 |
| 178 bool CompositorOutputSurface::Send(IPC::Message* message) { | 179 bool CompositorOutputSurface::Send(IPC::Message* message) { |
| 179 return message_sender_->Send(message); | 180 return message_sender_->Send(message); |
| 180 } | 181 } |
| 181 | 182 |
| 182 } // namespace content | 183 } // namespace content |
| OLD | NEW |