| 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 "content/renderer/child_frame_compositing_helper.h" | 5 #include "content/renderer/child_frame_compositing_helper.h" |
| 6 | 6 |
| 7 #include "cc/blink/web_layer_impl.h" | 7 #include "cc/blink/web_layer_impl.h" |
| 8 #include "cc/layers/delegated_frame_provider.h" | 8 #include "cc/layers/delegated_frame_provider.h" |
| 9 #include "cc/layers/delegated_frame_resource_collection.h" | 9 #include "cc/layers/delegated_frame_resource_collection.h" |
| 10 #include "cc/layers/delegated_renderer_layer.h" | 10 #include "cc/layers/delegated_renderer_layer.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings()); | 176 cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings()); |
| 177 crashed_layer->SetMasksToBounds(true); | 177 crashed_layer->SetMasksToBounds(true); |
| 178 crashed_layer->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0)); | 178 crashed_layer->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0)); |
| 179 blink::WebLayer* layer = new cc_blink::WebLayerImpl(crashed_layer); | 179 blink::WebLayer* layer = new cc_blink::WebLayerImpl(crashed_layer); |
| 180 UpdateWebLayer(layer); | 180 UpdateWebLayer(layer); |
| 181 } | 181 } |
| 182 | 182 |
| 183 void ChildFrameCompositingHelper::OnCompositorFrameSwapped( | 183 void ChildFrameCompositingHelper::OnCompositorFrameSwapped( |
| 184 scoped_ptr<cc::CompositorFrame> frame, | 184 scoped_ptr<cc::CompositorFrame> frame, |
| 185 int route_id, | 185 int route_id, |
| 186 uint32 output_surface_id, | 186 uint32_t output_surface_id, |
| 187 int host_id, | 187 int host_id, |
| 188 base::SharedMemoryHandle handle) { | 188 base::SharedMemoryHandle handle) { |
| 189 cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); | 189 cc::DelegatedFrameData* frame_data = frame->delegated_frame_data.get(); |
| 190 | 190 |
| 191 // Do nothing if we are getting destroyed or have no frame data. | 191 // Do nothing if we are getting destroyed or have no frame data. |
| 192 if (!frame_data) | 192 if (!frame_data) |
| 193 return; | 193 return; |
| 194 | 194 |
| 195 DCHECK(!frame_data->render_pass_list.empty()); | 195 DCHECK(!frame_data->render_pass_list.empty()); |
| 196 cc::RenderPass* root_pass = frame_data->render_pass_list.back().get(); | 196 cc::RenderPass* root_pass = frame_data->render_pass_list.back().get(); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 ¶ms.ack.resources); | 353 ¶ms.ack.resources); |
| 354 DCHECK(!params.ack.resources.empty()); | 354 DCHECK(!params.ack.resources.empty()); |
| 355 | 355 |
| 356 params.route_id = last_route_id_; | 356 params.route_id = last_route_id_; |
| 357 params.output_surface_id = last_output_surface_id_; | 357 params.output_surface_id = last_output_surface_id_; |
| 358 params.renderer_host_id = last_host_id_; | 358 params.renderer_host_id = last_host_id_; |
| 359 SendReclaimCompositorResourcesToBrowser(params); | 359 SendReclaimCompositorResourcesToBrowser(params); |
| 360 } | 360 } |
| 361 | 361 |
| 362 } // namespace content | 362 } // namespace content |
| OLD | NEW |