| 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 #ifndef CC_SURFACES_DISPLAY_H_ | 5 #ifndef CC_SURFACES_DISPLAY_H_ |
| 6 #define CC_SURFACES_DISPLAY_H_ | 6 #define CC_SURFACES_DISPLAY_H_ |
| 7 | 7 |
| 8 #include "cc/surfaces/display.h" | 8 #include "cc/surfaces/display.h" |
| 9 | 9 |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 } | 59 } |
| 60 if (!delegated_frame_provider_ || | 60 if (!delegated_frame_provider_ || |
| 61 delegated_frame_provider_->frame_size() != | 61 delegated_frame_provider_->frame_size() != |
| 62 frame_data->render_pass_list.back()->output_rect.size()) { | 62 frame_data->render_pass_list.back()->output_rect.size()) { |
| 63 delegated_frame_provider_ = | 63 delegated_frame_provider_ = |
| 64 new DelegatedFrameProvider(resource_collection_, frame_data.Pass()); | 64 new DelegatedFrameProvider(resource_collection_, frame_data.Pass()); |
| 65 delegated_layer_ = | 65 delegated_layer_ = |
| 66 DelegatedRendererLayer::Create(delegated_frame_provider_); | 66 DelegatedRendererLayer::Create(delegated_frame_provider_); |
| 67 | 67 |
| 68 layer_tree_host_->SetRootLayer(delegated_layer_); | 68 layer_tree_host_->SetRootLayer(delegated_layer_); |
| 69 delegated_layer_->SetDisplaySize(current_surface_->size()); | |
| 70 delegated_layer_->SetBounds(current_surface_->size()); | 69 delegated_layer_->SetBounds(current_surface_->size()); |
| 71 delegated_layer_->SetContentsOpaque(true); | 70 delegated_layer_->SetContentsOpaque(true); |
| 72 delegated_layer_->SetIsDrawable(true); | 71 delegated_layer_->SetIsDrawable(true); |
| 73 } else { | 72 } else { |
| 74 delegated_frame_provider_->SetFrameData(frame_data.Pass()); | 73 delegated_frame_provider_->SetFrameData(frame_data.Pass()); |
| 75 } | 74 } |
| 76 layer_tree_host_->SetViewportSize(current_surface_->size()); | 75 layer_tree_host_->SetViewportSize(current_surface_->size()); |
| 77 | 76 |
| 78 return true; | 77 return true; |
| 79 } | 78 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 107 } | 106 } |
| 108 | 107 |
| 109 void Display::ReturnResources(const ReturnedResourceArray& resources) { | 108 void Display::ReturnResources(const ReturnedResourceArray& resources) { |
| 110 // We never generate any resources, so we should never have any returned. | 109 // We never generate any resources, so we should never have any returned. |
| 111 DCHECK(resources.empty()); | 110 DCHECK(resources.empty()); |
| 112 } | 111 } |
| 113 | 112 |
| 114 } // namespace cc | 113 } // namespace cc |
| 115 | 114 |
| 116 #endif // CC_SURFACES_DISPLAY_H_ | 115 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |