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/browser_view_renderer.h" | 5 #include "android_webview/browser/browser_view_renderer.h" |
6 | 6 |
7 #include "android_webview/browser/browser_view_renderer_client.h" | 7 #include "android_webview/browser/browser_view_renderer_client.h" |
8 #include "android_webview/browser/child_frame.h" | 8 #include "android_webview/browser/child_frame.h" |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 is_paused_(false), | 91 is_paused_(false), |
92 view_visible_(false), | 92 view_visible_(false), |
93 window_visible_(false), | 93 window_visible_(false), |
94 attached_to_window_(false), | 94 attached_to_window_(false), |
95 hardware_enabled_(false), | 95 hardware_enabled_(false), |
96 dip_scale_(0.0), | 96 dip_scale_(0.0), |
97 page_scale_factor_(1.0), | 97 page_scale_factor_(1.0), |
98 on_new_picture_enable_(false), | 98 on_new_picture_enable_(false), |
99 clear_view_(false), | 99 clear_view_(false), |
100 offscreen_pre_raster_(false), | 100 offscreen_pre_raster_(false), |
101 compositor_needs_continuous_invalidate_(false), | |
102 block_invalidates_(false), | |
103 fallback_tick_pending_(false) { | 101 fallback_tick_pending_(false) { |
104 } | 102 } |
105 | 103 |
106 BrowserViewRenderer::~BrowserViewRenderer() { | 104 BrowserViewRenderer::~BrowserViewRenderer() { |
107 } | 105 } |
108 | 106 |
109 void BrowserViewRenderer::RegisterWithWebContents( | 107 void BrowserViewRenderer::RegisterWithWebContents( |
110 content::WebContents* web_contents) { | 108 content::WebContents* web_contents) { |
111 web_contents->SetUserData(kBrowserViewRendererUserDataKey, | 109 web_contents->SetUserData(kBrowserViewRendererUserDataKey, |
112 new BrowserViewRendererUserData(this)); | 110 new BrowserViewRendererUserData(this)); |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_ClearView", | 189 TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_ClearView", |
192 TRACE_EVENT_SCOPE_THREAD); | 190 TRACE_EVENT_SCOPE_THREAD); |
193 return false; | 191 return false; |
194 } | 192 } |
195 | 193 |
196 return true; | 194 return true; |
197 } | 195 } |
198 | 196 |
199 bool BrowserViewRenderer::OnDrawHardware() { | 197 bool BrowserViewRenderer::OnDrawHardware() { |
200 TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDrawHardware"); | 198 TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDrawHardware"); |
| 199 |
201 shared_renderer_state_.InitializeHardwareDrawIfNeededOnUI(); | 200 shared_renderer_state_.InitializeHardwareDrawIfNeededOnUI(); |
202 | 201 |
203 if (!CanOnDraw()) { | 202 if (!CanOnDraw()) { |
204 return false; | 203 return false; |
205 } | 204 } |
206 | 205 |
207 shared_renderer_state_.SetScrollOffsetOnUI(last_on_draw_scroll_offset_); | 206 shared_renderer_state_.SetScrollOffsetOnUI(last_on_draw_scroll_offset_); |
208 | 207 |
209 if (!hardware_enabled_) { | 208 if (!hardware_enabled_) { |
210 TRACE_EVENT0("android_webview", "InitializeHwDraw"); | 209 TRACE_EVENT0("android_webview", "InitializeHwDraw"); |
211 hardware_enabled_ = compositor_->InitializeHwDraw(); | 210 hardware_enabled_ = compositor_->InitializeHwDraw(); |
212 } | 211 } |
213 if (!hardware_enabled_) { | 212 if (!hardware_enabled_) { |
214 TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_HardwareNotEnabled", | 213 TRACE_EVENT_INSTANT0("android_webview", "EarlyOut_HardwareNotEnabled", |
215 TRACE_EVENT_SCOPE_THREAD); | 214 TRACE_EVENT_SCOPE_THREAD); |
216 return false; | 215 return false; |
217 } | 216 } |
218 | 217 |
219 return CompositeHw(); | 218 return CompositeHw(); |
220 } | 219 } |
221 | 220 |
222 bool BrowserViewRenderer::CompositeHw() { | 221 bool BrowserViewRenderer::CompositeHw() { |
| 222 CancelFallbackTick(); |
| 223 |
223 ReturnResourceFromParent(); | 224 ReturnResourceFromParent(); |
224 compositor_->SetMemoryPolicy(CalculateDesiredMemoryPolicy()); | 225 compositor_->SetMemoryPolicy(CalculateDesiredMemoryPolicy()); |
225 | 226 |
226 ParentCompositorDrawConstraints parent_draw_constraints = | 227 ParentCompositorDrawConstraints parent_draw_constraints = |
227 shared_renderer_state_.GetParentDrawConstraintsOnUI(); | 228 shared_renderer_state_.GetParentDrawConstraintsOnUI(); |
228 gfx::Size surface_size(size_); | 229 gfx::Size surface_size(size_); |
229 gfx::Rect viewport(surface_size); | 230 gfx::Rect viewport(surface_size); |
230 gfx::Rect clip = viewport; | 231 gfx::Rect clip = viewport; |
231 gfx::Transform transform_for_tile_priority = | 232 gfx::Transform transform_for_tile_priority = |
232 parent_draw_constraints.transform; | 233 parent_draw_constraints.transform; |
(...skipping 23 matching lines...) Expand all Loading... |
256 TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame", | 257 TRACE_EVENT_INSTANT0("android_webview", "NoNewFrame", |
257 TRACE_EVENT_SCOPE_THREAD); | 258 TRACE_EVENT_SCOPE_THREAD); |
258 return false; | 259 return false; |
259 } | 260 } |
260 | 261 |
261 scoped_ptr<ChildFrame> child_frame = make_scoped_ptr( | 262 scoped_ptr<ChildFrame> child_frame = make_scoped_ptr( |
262 new ChildFrame(frame.Pass(), viewport_rect_for_tile_priority, | 263 new ChildFrame(frame.Pass(), viewport_rect_for_tile_priority, |
263 transform_for_tile_priority, offscreen_pre_raster_, | 264 transform_for_tile_priority, offscreen_pre_raster_, |
264 parent_draw_constraints.is_layer)); | 265 parent_draw_constraints.is_layer)); |
265 | 266 |
266 DidComposite(); | |
267 // Uncommitted frame can happen with consecutive fallback ticks. | 267 // Uncommitted frame can happen with consecutive fallback ticks. |
268 ReturnUnusedResource(shared_renderer_state_.PassUncommittedFrameOnUI()); | 268 ReturnUnusedResource(shared_renderer_state_.PassUncommittedFrameOnUI()); |
269 shared_renderer_state_.SetCompositorFrameOnUI(child_frame.Pass()); | 269 shared_renderer_state_.SetCompositorFrameOnUI(child_frame.Pass()); |
270 return true; | 270 return true; |
271 } | 271 } |
272 | 272 |
273 void BrowserViewRenderer::UpdateParentDrawConstraints() { | 273 void BrowserViewRenderer::UpdateParentDrawConstraints() { |
274 EnsureContinuousInvalidation(true); | 274 PostInvalidateWithFallback(); |
275 ParentCompositorDrawConstraints parent_draw_constraints = | 275 ParentCompositorDrawConstraints parent_draw_constraints = |
276 shared_renderer_state_.GetParentDrawConstraintsOnUI(); | 276 shared_renderer_state_.GetParentDrawConstraintsOnUI(); |
277 client_->ParentDrawConstraintsUpdated(parent_draw_constraints); | 277 client_->ParentDrawConstraintsUpdated(parent_draw_constraints); |
278 } | 278 } |
279 | 279 |
280 void BrowserViewRenderer::ReturnUnusedResource( | 280 void BrowserViewRenderer::ReturnUnusedResource( |
281 scoped_ptr<ChildFrame> child_frame) { | 281 scoped_ptr<ChildFrame> child_frame) { |
282 if (!child_frame.get() || !child_frame->frame.get()) | 282 if (!child_frame.get() || !child_frame->frame.get()) |
283 return; | 283 return; |
284 | 284 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 | 335 |
336 void BrowserViewRenderer::ClearView() { | 336 void BrowserViewRenderer::ClearView() { |
337 TRACE_EVENT_INSTANT0("android_webview", | 337 TRACE_EVENT_INSTANT0("android_webview", |
338 "BrowserViewRenderer::ClearView", | 338 "BrowserViewRenderer::ClearView", |
339 TRACE_EVENT_SCOPE_THREAD); | 339 TRACE_EVENT_SCOPE_THREAD); |
340 if (clear_view_) | 340 if (clear_view_) |
341 return; | 341 return; |
342 | 342 |
343 clear_view_ = true; | 343 clear_view_ = true; |
344 // Always invalidate ignoring the compositor to actually clear the webview. | 344 // Always invalidate ignoring the compositor to actually clear the webview. |
345 EnsureContinuousInvalidation(true); | 345 PostInvalidateWithFallback(); |
346 } | 346 } |
347 | 347 |
348 void BrowserViewRenderer::SetOffscreenPreRaster(bool enable) { | 348 void BrowserViewRenderer::SetOffscreenPreRaster(bool enable) { |
349 // TODO(hush): anything to do when the setting is toggled? | 349 // TODO(hush): anything to do when the setting is toggled? |
350 offscreen_pre_raster_ = enable; | 350 offscreen_pre_raster_ = enable; |
351 } | 351 } |
352 | 352 |
353 void BrowserViewRenderer::SetIsPaused(bool paused) { | 353 void BrowserViewRenderer::SetIsPaused(bool paused) { |
354 TRACE_EVENT_INSTANT1("android_webview", | 354 TRACE_EVENT_INSTANT1("android_webview", |
355 "BrowserViewRenderer::SetIsPaused", | 355 "BrowserViewRenderer::SetIsPaused", |
356 TRACE_EVENT_SCOPE_THREAD, | 356 TRACE_EVENT_SCOPE_THREAD, |
357 "paused", | 357 "paused", |
358 paused); | 358 paused); |
359 is_paused_ = paused; | 359 is_paused_ = paused; |
360 EnsureContinuousInvalidation(false); | 360 UpdateCompositorIsActive(); |
361 } | 361 } |
362 | 362 |
363 void BrowserViewRenderer::SetViewVisibility(bool view_visible) { | 363 void BrowserViewRenderer::SetViewVisibility(bool view_visible) { |
364 TRACE_EVENT_INSTANT1("android_webview", | 364 TRACE_EVENT_INSTANT1("android_webview", |
365 "BrowserViewRenderer::SetViewVisibility", | 365 "BrowserViewRenderer::SetViewVisibility", |
366 TRACE_EVENT_SCOPE_THREAD, | 366 TRACE_EVENT_SCOPE_THREAD, |
367 "view_visible", | 367 "view_visible", |
368 view_visible); | 368 view_visible); |
369 view_visible_ = view_visible; | 369 view_visible_ = view_visible; |
370 } | 370 } |
371 | 371 |
372 void BrowserViewRenderer::SetWindowVisibility(bool window_visible) { | 372 void BrowserViewRenderer::SetWindowVisibility(bool window_visible) { |
373 TRACE_EVENT_INSTANT1("android_webview", | 373 TRACE_EVENT_INSTANT1("android_webview", |
374 "BrowserViewRenderer::SetWindowVisibility", | 374 "BrowserViewRenderer::SetWindowVisibility", |
375 TRACE_EVENT_SCOPE_THREAD, | 375 TRACE_EVENT_SCOPE_THREAD, |
376 "window_visible", | 376 "window_visible", |
377 window_visible); | 377 window_visible); |
378 window_visible_ = window_visible; | 378 window_visible_ = window_visible; |
379 EnsureContinuousInvalidation(false); | 379 UpdateCompositorIsActive(); |
380 } | 380 } |
381 | 381 |
382 void BrowserViewRenderer::OnSizeChanged(int width, int height) { | 382 void BrowserViewRenderer::OnSizeChanged(int width, int height) { |
383 TRACE_EVENT_INSTANT2("android_webview", | 383 TRACE_EVENT_INSTANT2("android_webview", |
384 "BrowserViewRenderer::OnSizeChanged", | 384 "BrowserViewRenderer::OnSizeChanged", |
385 TRACE_EVENT_SCOPE_THREAD, | 385 TRACE_EVENT_SCOPE_THREAD, |
386 "width", | 386 "width", |
387 width, | 387 width, |
388 "height", | 388 "height", |
389 height); | 389 height); |
390 size_.SetSize(width, height); | 390 size_.SetSize(width, height); |
391 } | 391 } |
392 | 392 |
393 void BrowserViewRenderer::OnAttachedToWindow(int width, int height) { | 393 void BrowserViewRenderer::OnAttachedToWindow(int width, int height) { |
394 TRACE_EVENT2("android_webview", | 394 TRACE_EVENT2("android_webview", |
395 "BrowserViewRenderer::OnAttachedToWindow", | 395 "BrowserViewRenderer::OnAttachedToWindow", |
396 "width", | 396 "width", |
397 width, | 397 width, |
398 "height", | 398 "height", |
399 height); | 399 height); |
400 attached_to_window_ = true; | 400 attached_to_window_ = true; |
401 size_.SetSize(width, height); | 401 size_.SetSize(width, height); |
| 402 UpdateCompositorIsActive(); |
402 } | 403 } |
403 | 404 |
404 void BrowserViewRenderer::OnDetachedFromWindow() { | 405 void BrowserViewRenderer::OnDetachedFromWindow() { |
405 TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDetachedFromWindow"); | 406 TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDetachedFromWindow"); |
406 shared_renderer_state_.ReleaseHardwareDrawIfNeededOnUI(); | 407 shared_renderer_state_.ReleaseHardwareDrawIfNeededOnUI(); |
407 attached_to_window_ = false; | 408 attached_to_window_ = false; |
408 DCHECK(!hardware_enabled_); | 409 DCHECK(!hardware_enabled_); |
| 410 UpdateCompositorIsActive(); |
409 } | 411 } |
410 | 412 |
411 void BrowserViewRenderer::ReleaseHardware() { | 413 void BrowserViewRenderer::ReleaseHardware() { |
412 DCHECK(hardware_enabled_); | 414 DCHECK(hardware_enabled_); |
413 ReturnUnusedResource(shared_renderer_state_.PassUncommittedFrameOnUI()); | 415 ReturnUnusedResource(shared_renderer_state_.PassUncommittedFrameOnUI()); |
414 ReturnResourceFromParent(); | 416 ReturnResourceFromParent(); |
415 DCHECK(shared_renderer_state_.ReturnedResourcesEmptyOnUI()); | 417 DCHECK(shared_renderer_state_.ReturnedResourcesEmptyOnUI()); |
416 | 418 |
417 if (compositor_) { | 419 if (compositor_) { |
418 compositor_->ReleaseHwDraw(); | 420 compositor_->ReleaseHwDraw(); |
(...skipping 11 matching lines...) Expand all Loading... |
430 return gfx::Rect(client_->GetLocationOnScreen(), size_); | 432 return gfx::Rect(client_->GetLocationOnScreen(), size_); |
431 } | 433 } |
432 | 434 |
433 void BrowserViewRenderer::DidInitializeCompositor( | 435 void BrowserViewRenderer::DidInitializeCompositor( |
434 content::SynchronousCompositor* compositor) { | 436 content::SynchronousCompositor* compositor) { |
435 TRACE_EVENT0("android_webview", | 437 TRACE_EVENT0("android_webview", |
436 "BrowserViewRenderer::DidInitializeCompositor"); | 438 "BrowserViewRenderer::DidInitializeCompositor"); |
437 DCHECK(compositor); | 439 DCHECK(compositor); |
438 DCHECK(!compositor_); | 440 DCHECK(!compositor_); |
439 compositor_ = compositor; | 441 compositor_ = compositor; |
| 442 UpdateCompositorIsActive(); |
440 } | 443 } |
441 | 444 |
442 void BrowserViewRenderer::DidDestroyCompositor( | 445 void BrowserViewRenderer::DidDestroyCompositor( |
443 content::SynchronousCompositor* compositor) { | 446 content::SynchronousCompositor* compositor) { |
444 TRACE_EVENT0("android_webview", "BrowserViewRenderer::DidDestroyCompositor"); | 447 TRACE_EVENT0("android_webview", "BrowserViewRenderer::DidDestroyCompositor"); |
445 DCHECK(compositor_); | 448 DCHECK(compositor_); |
446 compositor_ = NULL; | 449 compositor_ = NULL; |
447 } | 450 } |
448 | 451 |
449 void BrowserViewRenderer::SetContinuousInvalidate(bool invalidate) { | |
450 if (compositor_needs_continuous_invalidate_ == invalidate) | |
451 return; | |
452 | |
453 TRACE_EVENT_INSTANT1("android_webview", | |
454 "BrowserViewRenderer::SetContinuousInvalidate", | |
455 TRACE_EVENT_SCOPE_THREAD, | |
456 "invalidate", | |
457 invalidate); | |
458 compositor_needs_continuous_invalidate_ = invalidate; | |
459 | |
460 EnsureContinuousInvalidation(false); | |
461 } | |
462 | |
463 void BrowserViewRenderer::SetDipScale(float dip_scale) { | 452 void BrowserViewRenderer::SetDipScale(float dip_scale) { |
464 dip_scale_ = dip_scale; | 453 dip_scale_ = dip_scale; |
465 CHECK_GT(dip_scale_, 0.f); | 454 CHECK_GT(dip_scale_, 0.f); |
466 } | 455 } |
467 | 456 |
468 gfx::Vector2d BrowserViewRenderer::max_scroll_offset() const { | 457 gfx::Vector2d BrowserViewRenderer::max_scroll_offset() const { |
469 DCHECK_GT(dip_scale_, 0.f); | 458 DCHECK_GT(dip_scale_, 0.f); |
470 return gfx::ToCeiledVector2d(gfx::ScaleVector2d( | 459 return gfx::ToCeiledVector2d(gfx::ScaleVector2d( |
471 max_scroll_offset_dip_, dip_scale_ * page_scale_factor_)); | 460 max_scroll_offset_dip_, dip_scale_ * page_scale_factor_)); |
472 } | 461 } |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 overscroll_rounding_error_ = gfx::Vector2dF(); | 609 overscroll_rounding_error_ = gfx::Vector2dF(); |
621 gfx::Vector2dF scaled_overscroll_delta = | 610 gfx::Vector2dF scaled_overscroll_delta = |
622 gfx::ScaleVector2d(latest_overscroll_delta, physical_pixel_scale); | 611 gfx::ScaleVector2d(latest_overscroll_delta, physical_pixel_scale); |
623 gfx::Vector2d rounded_overscroll_delta = gfx::ToRoundedVector2d( | 612 gfx::Vector2d rounded_overscroll_delta = gfx::ToRoundedVector2d( |
624 scaled_overscroll_delta + overscroll_rounding_error_); | 613 scaled_overscroll_delta + overscroll_rounding_error_); |
625 overscroll_rounding_error_ = | 614 overscroll_rounding_error_ = |
626 scaled_overscroll_delta - rounded_overscroll_delta; | 615 scaled_overscroll_delta - rounded_overscroll_delta; |
627 client_->DidOverscroll(rounded_overscroll_delta); | 616 client_->DidOverscroll(rounded_overscroll_delta); |
628 } | 617 } |
629 | 618 |
630 void BrowserViewRenderer::EnsureContinuousInvalidation(bool force_invalidate) { | 619 void BrowserViewRenderer::PostInvalidate() { |
631 // This method should be called again when any of these conditions change. | 620 TRACE_EVENT_INSTANT0("android_webview", "BrowserViewRenderer::PostInvalidate", |
632 bool need_invalidate = | 621 TRACE_EVENT_SCOPE_THREAD); |
633 compositor_needs_continuous_invalidate_ || force_invalidate; | 622 PostInvalidateWithFallback(); |
634 if (!need_invalidate || block_invalidates_) | 623 } |
635 return; | |
636 | 624 |
| 625 void BrowserViewRenderer::PostInvalidateWithFallback() { |
637 // Always call view invalidate. We rely the Android framework to ignore the | 626 // Always call view invalidate. We rely the Android framework to ignore the |
638 // invalidate when it's not needed such as when view is not visible. | 627 // invalidate when it's not needed such as when view is not visible. |
639 client_->PostInvalidate(); | 628 client_->PostInvalidate(); |
640 | 629 |
641 // Stop fallback ticks when one of these is true. | 630 // Stop fallback ticks when one of these is true. |
642 // 1) Webview is paused. Also need to check we are not in clear view since | 631 // 1) Webview is paused. Also need to check we are not in clear view since |
643 // paused, offscreen still expect clear view to recover. | 632 // paused, offscreen still expect clear view to recover. |
644 // 2) If we are attached to window and the window is not visible (eg when | 633 // 2) If we are attached to window and the window is not visible (eg when |
645 // app is in the background). We are sure in this case the webview is used | 634 // app is in the background). We are sure in this case the webview is used |
646 // "on-screen" but that updates are not needed when in the background. | 635 // "on-screen" but that updates are not needed when in the background. |
647 bool throttle_fallback_tick = | 636 bool throttle_fallback_tick = |
648 (is_paused_ && !clear_view_) || (attached_to_window_ && !window_visible_); | 637 (is_paused_ && !clear_view_) || (attached_to_window_ && !window_visible_); |
649 if (throttle_fallback_tick) | 638 |
| 639 if (throttle_fallback_tick || fallback_tick_pending_) |
650 return; | 640 return; |
651 | 641 |
652 block_invalidates_ = compositor_needs_continuous_invalidate_; | 642 DCHECK(post_fallback_tick_.IsCancelled()); |
653 if (fallback_tick_pending_) | 643 DCHECK(fallback_tick_fired_.IsCancelled()); |
654 return; | |
655 | 644 |
656 // Unretained here is safe because the callbacks are cancelled when | |
657 // they are destroyed. | |
658 post_fallback_tick_.Reset(base::Bind(&BrowserViewRenderer::PostFallbackTick, | 645 post_fallback_tick_.Reset(base::Bind(&BrowserViewRenderer::PostFallbackTick, |
659 base::Unretained(this))); | 646 base::Unretained(this))); |
| 647 ui_task_runner_->PostTask(FROM_HERE, post_fallback_tick_.callback()); |
| 648 fallback_tick_pending_ = true; |
| 649 } |
| 650 |
| 651 void BrowserViewRenderer::CancelFallbackTick() { |
| 652 post_fallback_tick_.Cancel(); |
660 fallback_tick_fired_.Cancel(); | 653 fallback_tick_fired_.Cancel(); |
661 fallback_tick_pending_ = false; | 654 fallback_tick_pending_ = false; |
662 | |
663 // No need to reschedule fallback tick if compositor does not need to be | |
664 // ticked. This can happen if this is reached because force_invalidate is | |
665 // true. | |
666 if (compositor_needs_continuous_invalidate_) { | |
667 fallback_tick_pending_ = true; | |
668 ui_task_runner_->PostTask(FROM_HERE, post_fallback_tick_.callback()); | |
669 } | |
670 } | 655 } |
671 | 656 |
672 void BrowserViewRenderer::PostFallbackTick() { | 657 void BrowserViewRenderer::PostFallbackTick() { |
673 DCHECK(fallback_tick_fired_.IsCancelled()); | 658 DCHECK(fallback_tick_fired_.IsCancelled()); |
| 659 TRACE_EVENT0("android_webview", "BrowserViewRenderer::PostFallbackTick"); |
| 660 post_fallback_tick_.Cancel(); |
674 fallback_tick_fired_.Reset(base::Bind(&BrowserViewRenderer::FallbackTickFired, | 661 fallback_tick_fired_.Reset(base::Bind(&BrowserViewRenderer::FallbackTickFired, |
675 base::Unretained(this))); | 662 base::Unretained(this))); |
676 if (compositor_needs_continuous_invalidate_) { | 663 ui_task_runner_->PostDelayedTask( |
677 ui_task_runner_->PostDelayedTask( | 664 FROM_HERE, fallback_tick_fired_.callback(), |
678 FROM_HERE, | 665 base::TimeDelta::FromMilliseconds(kFallbackTickTimeoutInMilliseconds)); |
679 fallback_tick_fired_.callback(), | |
680 base::TimeDelta::FromMilliseconds(kFallbackTickTimeoutInMilliseconds)); | |
681 } else { | |
682 // Pretend we just composited to unblock further invalidates. | |
683 DidComposite(); | |
684 } | |
685 } | 666 } |
686 | 667 |
687 void BrowserViewRenderer::FallbackTickFired() { | 668 void BrowserViewRenderer::FallbackTickFired() { |
688 TRACE_EVENT1("android_webview", | 669 TRACE_EVENT0("android_webview", "BrowserViewRenderer::FallbackTickFired"); |
689 "BrowserViewRenderer::FallbackTickFired", | |
690 "compositor_needs_continuous_invalidate_", | |
691 compositor_needs_continuous_invalidate_); | |
692 | |
693 // This should only be called if OnDraw or DrawGL did not come in time, which | 670 // This should only be called if OnDraw or DrawGL did not come in time, which |
694 // means block_invalidates_ must still be true. | 671 // means fallback_tick_pending_ must still be true. |
695 DCHECK(block_invalidates_); | 672 DCHECK(fallback_tick_pending_); |
| 673 fallback_tick_fired_.Cancel(); |
696 fallback_tick_pending_ = false; | 674 fallback_tick_pending_ = false; |
697 if (compositor_needs_continuous_invalidate_ && compositor_) { | 675 if (compositor_) { |
698 if (hardware_enabled_) { | 676 if (hardware_enabled_) { |
699 CompositeHw(); | 677 CompositeHw(); |
700 } else { | 678 } else { |
701 ForceFakeCompositeSW(); | 679 ForceFakeCompositeSW(); |
702 } | 680 } |
703 } else { | |
704 // Pretend we just composited to unblock further invalidates. | |
705 DidComposite(); | |
706 } | 681 } |
707 } | 682 } |
708 | 683 |
709 void BrowserViewRenderer::ForceFakeCompositeSW() { | 684 void BrowserViewRenderer::ForceFakeCompositeSW() { |
710 DCHECK(compositor_); | 685 DCHECK(compositor_); |
711 SkBitmap bitmap; | 686 SkBitmap bitmap; |
712 bitmap.allocN32Pixels(1, 1); | 687 bitmap.allocN32Pixels(1, 1); |
713 bitmap.eraseColor(0); | 688 bitmap.eraseColor(0); |
714 SkCanvas canvas(bitmap); | 689 SkCanvas canvas(bitmap); |
715 CompositeSW(&canvas); | 690 CompositeSW(&canvas); |
716 } | 691 } |
717 | 692 |
718 bool BrowserViewRenderer::CompositeSW(SkCanvas* canvas) { | 693 bool BrowserViewRenderer::CompositeSW(SkCanvas* canvas) { |
719 DCHECK(compositor_); | 694 DCHECK(compositor_); |
| 695 CancelFallbackTick(); |
720 ReturnResourceFromParent(); | 696 ReturnResourceFromParent(); |
721 bool result = compositor_->DemandDrawSw(canvas); | 697 return compositor_->DemandDrawSw(canvas); |
722 DidComposite(); | |
723 return result; | |
724 } | 698 } |
725 | 699 |
726 void BrowserViewRenderer::DidComposite() { | 700 void BrowserViewRenderer::UpdateCompositorIsActive() { |
727 block_invalidates_ = false; | 701 if (compositor_) |
728 post_fallback_tick_.Cancel(); | 702 compositor_->SetIsActive(!is_paused_ && |
729 fallback_tick_fired_.Cancel(); | 703 (!attached_to_window_ || window_visible_)); |
730 fallback_tick_pending_ = false; | |
731 EnsureContinuousInvalidation(false); | |
732 } | 704 } |
733 | 705 |
734 std::string BrowserViewRenderer::ToString() const { | 706 std::string BrowserViewRenderer::ToString() const { |
735 std::string str; | 707 std::string str; |
736 base::StringAppendF(&str, "is_paused: %d ", is_paused_); | 708 base::StringAppendF(&str, "is_paused: %d ", is_paused_); |
737 base::StringAppendF(&str, "view_visible: %d ", view_visible_); | 709 base::StringAppendF(&str, "view_visible: %d ", view_visible_); |
738 base::StringAppendF(&str, "window_visible: %d ", window_visible_); | 710 base::StringAppendF(&str, "window_visible: %d ", window_visible_); |
739 base::StringAppendF(&str, "dip_scale: %f ", dip_scale_); | 711 base::StringAppendF(&str, "dip_scale: %f ", dip_scale_); |
740 base::StringAppendF(&str, "page_scale_factor: %f ", page_scale_factor_); | 712 base::StringAppendF(&str, "page_scale_factor: %f ", page_scale_factor_); |
741 base::StringAppendF(&str, | 713 base::StringAppendF(&str, "fallback_tick_pending: %d ", |
742 "compositor_needs_continuous_invalidate: %d ", | 714 fallback_tick_pending_); |
743 compositor_needs_continuous_invalidate_); | |
744 base::StringAppendF(&str, "block_invalidates: %d ", block_invalidates_); | |
745 base::StringAppendF(&str, "view size: %s ", size_.ToString().c_str()); | 715 base::StringAppendF(&str, "view size: %s ", size_.ToString().c_str()); |
746 base::StringAppendF(&str, "attached_to_window: %d ", attached_to_window_); | 716 base::StringAppendF(&str, "attached_to_window: %d ", attached_to_window_); |
747 base::StringAppendF(&str, | 717 base::StringAppendF(&str, |
748 "global visible rect: %s ", | 718 "global visible rect: %s ", |
749 last_on_draw_global_visible_rect_.ToString().c_str()); | 719 last_on_draw_global_visible_rect_.ToString().c_str()); |
750 base::StringAppendF( | 720 base::StringAppendF( |
751 &str, "scroll_offset_dip: %s ", scroll_offset_dip_.ToString().c_str()); | 721 &str, "scroll_offset_dip: %s ", scroll_offset_dip_.ToString().c_str()); |
752 base::StringAppendF(&str, | 722 base::StringAppendF(&str, |
753 "overscroll_rounding_error_: %s ", | 723 "overscroll_rounding_error_: %s ", |
754 overscroll_rounding_error_.ToString().c_str()); | 724 overscroll_rounding_error_.ToString().c_str()); |
755 base::StringAppendF( | 725 base::StringAppendF( |
756 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); | 726 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); |
757 base::StringAppendF(&str, "clear_view: %d ", clear_view_); | 727 base::StringAppendF(&str, "clear_view: %d ", clear_view_); |
758 return str; | 728 return str; |
759 } | 729 } |
760 | 730 |
761 } // namespace android_webview | 731 } // namespace android_webview |
OLD | NEW |