| Index: android_webview/browser/browser_view_renderer.cc
|
| diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
|
| index 5b652b205904a01e871ce91b13b9bc2fad4987d0..a1d981e4eba9861699382aafa06155458b2b460c 100644
|
| --- a/android_webview/browser/browser_view_renderer.cc
|
| +++ b/android_webview/browser/browser_view_renderer.cc
|
| @@ -378,7 +378,6 @@ void BrowserViewRenderer::SetIsPaused(bool paused) {
|
| "paused",
|
| paused);
|
| is_paused_ = paused;
|
| - UpdateCompositorIsActive();
|
| }
|
|
|
| void BrowserViewRenderer::SetViewVisibility(bool view_visible) {
|
| @@ -397,7 +396,6 @@ void BrowserViewRenderer::SetWindowVisibility(bool window_visible) {
|
| "window_visible",
|
| window_visible);
|
| window_visible_ = window_visible;
|
| - UpdateCompositorIsActive();
|
| }
|
|
|
| void BrowserViewRenderer::OnSizeChanged(int width, int height) {
|
| @@ -424,14 +422,12 @@ void BrowserViewRenderer::OnAttachedToWindow(int width, int height) {
|
| size_.SetSize(width, height);
|
| if (offscreen_pre_raster_)
|
| UpdateMemoryPolicy();
|
| - UpdateCompositorIsActive();
|
| }
|
|
|
| void BrowserViewRenderer::OnDetachedFromWindow() {
|
| TRACE_EVENT0("android_webview", "BrowserViewRenderer::OnDetachedFromWindow");
|
| attached_to_window_ = false;
|
| ReleaseHardware();
|
| - UpdateCompositorIsActive();
|
| }
|
|
|
| void BrowserViewRenderer::ZoomBy(float delta) {
|
| @@ -508,7 +504,6 @@ void BrowserViewRenderer::DidDestroyCompositor(
|
| DCHECK(compositor_);
|
| if (compositor_ == compositor)
|
| compositor_ = nullptr;
|
| - compositor->SetIsActive(false);
|
| compositor_map_.erase(GetCompositorID(compositor));
|
| }
|
|
|
| @@ -519,11 +514,7 @@ void BrowserViewRenderer::DidBecomeCurrent(
|
| TRACE_EVENT_SCOPE_THREAD);
|
| DCHECK(compositor);
|
| DCHECK(GetCompositorID(compositor));
|
| - if (compositor_)
|
| - compositor_->SetIsActive(false);
|
| -
|
| compositor_ = compositor;
|
| - UpdateCompositorIsActive();
|
| }
|
|
|
| void BrowserViewRenderer::SetDipScale(float dip_scale) {
|
| @@ -706,13 +697,6 @@ bool BrowserViewRenderer::CompositeSW(SkCanvas* canvas) {
|
| return compositor_->DemandDrawSw(canvas);
|
| }
|
|
|
| -void BrowserViewRenderer::UpdateCompositorIsActive() {
|
| - if (compositor_) {
|
| - compositor_->SetIsActive(!is_paused_ &&
|
| - (!attached_to_window_ || window_visible_));
|
| - }
|
| -}
|
| -
|
| std::string BrowserViewRenderer::ToString() const {
|
| std::string str;
|
| base::StringAppendF(&str, "is_paused: %d ", is_paused_);
|
|
|