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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
181 delegated_layer_->SetIsDrawable(true); | 181 delegated_layer_->SetIsDrawable(true); |
182 | 182 |
183 root_layer_->AddChild(delegated_layer_); | 183 root_layer_->AddChild(delegated_layer_); |
184 } else { | 184 } else { |
185 frame_provider_->SetFrameData(input->frame.delegated_frame_data.Pass()); | 185 frame_provider_->SetFrameData(input->frame.delegated_frame_data.Pass()); |
186 } | 186 } |
187 } | 187 } |
188 | 188 |
189 viewport_.SetSize(draw_info->width, draw_info->height); | 189 viewport_.SetSize(draw_info->width, draw_info->height); |
190 layer_tree_host_->SetViewportSize(viewport_); | 190 layer_tree_host_->SetViewportSize(viewport_); |
191 clip_.SetRect(draw_info->clip_left, | 191 gfx::Rect clip(draw_info->clip_left, |
192 draw_info->clip_top, | 192 draw_info->clip_top, |
193 draw_info->clip_right - draw_info->clip_left, | 193 draw_info->clip_right - draw_info->clip_left, |
194 draw_info->clip_bottom - draw_info->clip_top); | 194 draw_info->clip_bottom - draw_info->clip_top); |
195 stencil_enabled_ = stencil_enabled; | 195 stencil_enabled_ = stencil_enabled; |
196 | 196 |
197 gfx::Transform transform(gfx::Transform::kSkipInitialization); | 197 gfx::Transform transform(gfx::Transform::kSkipInitialization); |
198 transform.matrix().setColMajorf(draw_info->transform); | 198 transform.matrix().setColMajorf(draw_info->transform); |
199 transform.Translate(scroll_offset_.x(), scroll_offset_.y()); | 199 transform.Translate(scroll_offset_.x(), scroll_offset_.y()); |
200 delegated_layer_->SetTransform(transform); | 200 delegated_layer_->SetTransform(transform); |
201 | 201 |
202 gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext); | 202 gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext); |
203 { | 203 { |
204 base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_, | 204 base::AutoReset<bool> frame_resetter(&viewport_clip_valid_for_dcheck_, |
205 true); | 205 true); |
206 layer_tree_host_->SetNeedsRedrawRect(clip_); | 206 layer_tree_host_->SetNeedsRedrawRect(clip); |
207 layer_tree_host_->Composite(gfx::FrameTime::Now()); | 207 layer_tree_host_->Composite(gfx::FrameTime::Now()); |
208 } | 208 } |
209 gl_surface_->ResetBackingFrameBufferObject(); | 209 gl_surface_->ResetBackingFrameBufferObject(); |
210 | |
211 // Need to post the new transform matrix and clip back to child compositor | |
212 // because there is no onDraw during a Render Thread animation, and child | |
213 // compositor might not have the tiles rasterized as the animation goes on. | |
214 if (transform != transform_ || clip != clip_) { | |
215 transform_ = transform; | |
216 clip_ = clip; | |
boliu
2014/07/16 17:25:10
child shouldn't need the clip, clip isn't suitable
hush (inactive)
2014/07/16 20:45:32
okay.
I also change the function name to PostExter
| |
217 shared_renderer_state_->PostExternalDrawConstraintsToChildCompositor( | |
218 clip_, transform_); | |
219 } | |
210 } | 220 } |
211 | 221 |
212 scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface( | 222 scoped_ptr<cc::OutputSurface> HardwareRenderer::CreateOutputSurface( |
213 bool fallback) { | 223 bool fallback) { |
214 // Android webview does not support losing output surface. | 224 // Android webview does not support losing output surface. |
215 DCHECK(!fallback); | 225 DCHECK(!fallback); |
216 scoped_refptr<cc::ContextProvider> context_provider = | 226 scoped_refptr<cc::ContextProvider> context_provider = |
217 CreateContext(gl_surface_, | 227 CreateContext(gl_surface_, |
218 DeferredGpuCommandService::GetInstance(), | 228 DeferredGpuCommandService::GetInstance(), |
219 shared_renderer_state_->GetSharedContext()); | 229 shared_renderer_state_->GetSharedContext()); |
220 scoped_ptr<ParentOutputSurface> output_surface_holder( | 230 scoped_ptr<ParentOutputSurface> output_surface_holder( |
221 new ParentOutputSurface(context_provider)); | 231 new ParentOutputSurface(context_provider)); |
222 output_surface_ = output_surface_holder.get(); | 232 output_surface_ = output_surface_holder.get(); |
223 return output_surface_holder.PassAs<cc::OutputSurface>(); | 233 return output_surface_holder.PassAs<cc::OutputSurface>(); |
224 } | 234 } |
225 | 235 |
226 void HardwareRenderer::UnusedResourcesAreAvailable() { | 236 void HardwareRenderer::UnusedResourcesAreAvailable() { |
227 cc::ReturnedResourceArray returned_resources; | 237 cc::ReturnedResourceArray returned_resources; |
228 resource_collection_->TakeUnusedResourcesForChildCompositor( | 238 resource_collection_->TakeUnusedResourcesForChildCompositor( |
229 &returned_resources); | 239 &returned_resources); |
230 shared_renderer_state_->InsertReturnedResources(returned_resources); | 240 shared_renderer_state_->InsertReturnedResources(returned_resources); |
231 } | 241 } |
232 | 242 |
233 } // namespace android_webview | 243 } // namespace android_webview |
OLD | NEW |