From 367d7dd63fb48978cf28918397a8269f368e6f27 Mon Sep 17 00:00:00 2001 From: hush Date: Fri, 29 Aug 2014 16:56:01 -0700 Subject: Remove resourceless_software_draw() and related unit tests. WebView passes the correct viewport and transform for tile priority in both hardware and resourceless software draws. As a result, PictureLayerImpl does not need to treat resourceless software draws differently. BUG=398587 Review URL: https://codereview.chromium.org/517893002 Cr-Commit-Position: refs/heads/master@{#292723} --- cc/layers/picture_layer_impl.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cc/layers/picture_layer_impl.cc') diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index cb6aab3..1f8e5a8 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -433,14 +433,10 @@ void PictureLayerImpl::UpdateTiles( DCHECK(!occlusion_tracker || layer_tree_impl()->settings().use_occlusion_for_tile_prioritization); - // Transforms and viewport are invalid for tile management inside a - // resourceless software draw, so don't update them. - if (!layer_tree_impl()->resourceless_software_draw()) { - visible_rect_for_tile_priority_ = visible_content_rect(); - viewport_rect_for_tile_priority_ = - layer_tree_impl()->ViewportRectForTilePriority(); - screen_space_transform_for_tile_priority_ = screen_space_transform(); - } + visible_rect_for_tile_priority_ = visible_content_rect(); + viewport_rect_for_tile_priority_ = + layer_tree_impl()->ViewportRectForTilePriority(); + screen_space_transform_for_tile_priority_ = screen_space_transform(); if (!CanHaveTilings()) { ideal_page_scale_ = 0.f; -- cgit v1.1