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 "android_webview/browser/hardware_renderer.h" | 5 #include "android_webview/browser/hardware_renderer.h" |
6 | 6 |
7 #include "android_webview/browser/aw_gl_surface.h" | 7 #include "android_webview/browser/aw_gl_surface.h" |
8 #include "android_webview/browser/deferred_gpu_command_service.h" | 8 #include "android_webview/browser/deferred_gpu_command_service.h" |
9 #include "android_webview/browser/parent_output_surface.h" | 9 #include "android_webview/browser/parent_output_surface.h" |
10 #include "android_webview/browser/shared_renderer_state.h" | 10 #include "android_webview/browser/shared_renderer_state.h" |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 return; | 167 return; |
168 | 168 |
169 scoped_ptr<DrawGLInput> input = committed_input_.Pass(); | 169 scoped_ptr<DrawGLInput> input = committed_input_.Pass(); |
170 gfx::Size frame_size = | 170 gfx::Size frame_size = |
171 input->frame.delegated_frame_data->render_pass_list.back() | 171 input->frame.delegated_frame_data->render_pass_list.back() |
172 ->output_rect.size(); | 172 ->output_rect.size(); |
173 bool size_changed = frame_size != frame_size_; | 173 bool size_changed = frame_size != frame_size_; |
174 frame_size_ = frame_size; | 174 frame_size_ = frame_size; |
175 scroll_offset_ = input->scroll_offset; | 175 scroll_offset_ = input->scroll_offset; |
176 | 176 |
177 if (!frame_provider_ || size_changed) { | 177 if (!frame_provider_.get() || size_changed) { |
178 if (delegated_layer_) { | 178 if (delegated_layer_.get()) { |
179 delegated_layer_->RemoveFromParent(); | 179 delegated_layer_->RemoveFromParent(); |
180 } | 180 } |
181 | 181 |
182 frame_provider_ = new cc::DelegatedFrameProvider( | 182 frame_provider_ = new cc::DelegatedFrameProvider( |
183 resource_collection_.get(), input->frame.delegated_frame_data.Pass()); | 183 resource_collection_.get(), input->frame.delegated_frame_data.Pass()); |
184 | 184 |
185 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); | 185 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); |
186 delegated_layer_->SetBounds(gfx::Size(input->width, input->height)); | 186 delegated_layer_->SetBounds(gfx::Size(input->width, input->height)); |
187 delegated_layer_->SetIsDrawable(true); | 187 delegated_layer_->SetIsDrawable(true); |
188 | 188 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 } | 258 } |
259 | 259 |
260 void HardwareRenderer::UnusedResourcesAreAvailable() { | 260 void HardwareRenderer::UnusedResourcesAreAvailable() { |
261 cc::ReturnedResourceArray returned_resources; | 261 cc::ReturnedResourceArray returned_resources; |
262 resource_collection_->TakeUnusedResourcesForChildCompositor( | 262 resource_collection_->TakeUnusedResourcesForChildCompositor( |
263 &returned_resources); | 263 &returned_resources); |
264 shared_renderer_state_->InsertReturnedResources(returned_resources); | 264 shared_renderer_state_->InsertReturnedResources(returned_resources); |
265 } | 265 } |
266 | 266 |
267 } // namespace android_webview | 267 } // namespace android_webview |
OLD | NEW |