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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 scroll_offset_ = input->scroll_offset; | 161 scroll_offset_ = input->scroll_offset; |
162 | 162 |
163 if (!frame_provider_ || size_changed) { | 163 if (!frame_provider_ || size_changed) { |
164 if (delegated_layer_) { | 164 if (delegated_layer_) { |
165 delegated_layer_->RemoveFromParent(); | 165 delegated_layer_->RemoveFromParent(); |
166 } | 166 } |
167 | 167 |
168 frame_provider_ = new cc::DelegatedFrameProvider( | 168 frame_provider_ = new cc::DelegatedFrameProvider( |
169 resource_collection_.get(), input->frame.delegated_frame_data.Pass()); | 169 resource_collection_.get(), input->frame.delegated_frame_data.Pass()); |
170 | 170 |
171 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); | 171 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); |
172 delegated_layer_->SetBounds(gfx::Size(view_width_, view_height_)); | 172 delegated_layer_->SetBounds(gfx::Size(view_width_, view_height_)); |
173 delegated_layer_->SetIsDrawable(true); | 173 delegated_layer_->SetIsDrawable(true); |
174 delegated_layer_->SetAnchorPoint(gfx::PointF(0.f, 0.f)); | 174 delegated_layer_->SetTransformOrigin(gfx::PointF(0.f, 0.f)); |
enne (OOO)
2014/06/03 23:28:51
It looks like there's a whole bunch of unnecessary
chrishtr
2014/06/03 23:41:55
Done.
| |
175 | 175 |
176 root_layer_->AddChild(delegated_layer_); | 176 root_layer_->AddChild(delegated_layer_); |
177 } else { | 177 } else { |
178 frame_provider_->SetFrameData(input->frame.delegated_frame_data.Pass()); | 178 frame_provider_->SetFrameData(input->frame.delegated_frame_data.Pass()); |
179 } | 179 } |
180 } | 180 } |
181 | 181 |
182 viewport_.SetSize(draw_info->width, draw_info->height); | 182 viewport_.SetSize(draw_info->width, draw_info->height); |
183 layer_tree_host_->SetViewportSize(viewport_); | 183 layer_tree_host_->SetViewportSize(viewport_); |
184 clip_.SetRect(draw_info->clip_left, | 184 clip_.SetRect(draw_info->clip_left, |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
218 } | 218 } |
219 | 219 |
220 void HardwareRenderer::UnusedResourcesAreAvailable() { | 220 void HardwareRenderer::UnusedResourcesAreAvailable() { |
221 cc::ReturnedResourceArray returned_resources; | 221 cc::ReturnedResourceArray returned_resources; |
222 resource_collection_->TakeUnusedResourcesForChildCompositor( | 222 resource_collection_->TakeUnusedResourcesForChildCompositor( |
223 &returned_resources); | 223 &returned_resources); |
224 shared_renderer_state_->InsertReturnedResources(returned_resources); | 224 shared_renderer_state_->InsertReturnedResources(returned_resources); |
225 } | 225 } |
226 | 226 |
227 } // namespace android_webview | 227 } // namespace android_webview |
OLD | NEW |