summaryrefslogtreecommitdiffstats
path: root/cc/trees
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-28 02:18:19 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-28 02:18:19 +0000
commit6751fa66ce82e3611df2166a20935027e96a5c73 (patch)
treef38d046765db0dada1d93a6f4050d2f95965aabe /cc/trees
parent2af3e370192e72abab6db1fd8e2febc36bf22934 (diff)
downloadchromium_src-6751fa66ce82e3611df2166a20935027e96a5c73.zip
chromium_src-6751fa66ce82e3611df2166a20935027e96a5c73.tar.gz
chromium_src-6751fa66ce82e3611df2166a20935027e96a5c73.tar.bz2
cc: Remove cheapness estimator usage from tile manager.
BUG=235995 TBR=nduca@chromium.org, vmpstr@chromium.org Review URL: https://codereview.chromium.org/13859012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees')
-rw-r--r--cc/trees/layer_tree_host_impl.cc6
-rw-r--r--cc/trees/layer_tree_host_impl.h1
-rw-r--r--cc/trees/layer_tree_settings.cc1
-rw-r--r--cc/trees/layer_tree_settings.h1
-rw-r--r--cc/trees/thread_proxy.cc3
5 files changed, 0 insertions, 12 deletions
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index a966089..2b708bb 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -299,11 +299,6 @@ void LayerTreeHostImpl::ManageTiles() {
memory_used_bytes);
}
-void LayerTreeHostImpl::SetAnticipatedDrawTime(base::TimeTicks time) {
- if (tile_manager_)
- tile_manager_->SetAnticipatedDrawTime(time);
-}
-
void LayerTreeHostImpl::StartPageScaleAnimation(gfx::Vector2d target_offset,
bool anchor_point,
float page_scale,
@@ -1375,7 +1370,6 @@ bool LayerTreeHostImpl::InitializeRenderer(
tile_manager_.reset(new TileManager(this,
resource_provider.get(),
settings_.num_raster_threads,
- settings_.use_cheapness_estimator,
settings_.use_color_estimator,
settings_.prediction_benchmarking,
rendering_stats_instrumentation_));
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index df3f23f..612d718 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -152,7 +152,6 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
void SetViewportDamage(gfx::Rect damage_rect);
void ManageTiles();
- void SetAnticipatedDrawTime(base::TimeTicks time);
// Returns false if problems occured preparing the frame, and we should try
// to avoid displaying the frame. If PrepareToDraw is called, DidDrawAllLayers
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 8751577..ea0c90a 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -32,7 +32,6 @@ LayerTreeSettings::LayerTreeSettings()
solid_color_scrollbar_color(SK_ColorWHITE),
solid_color_scrollbar_thickness_dip(-1),
calculate_top_controls_position(false),
- use_cheapness_estimator(false),
use_color_estimator(false),
use_memory_management(true),
prediction_benchmarking(false),
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index db9cb65..75db11f9 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -37,7 +37,6 @@ class CC_EXPORT LayerTreeSettings {
SkColor solid_color_scrollbar_color;
int solid_color_scrollbar_thickness_dip;
bool calculate_top_controls_position;
- bool use_cheapness_estimator;
bool use_color_estimator;
bool use_memory_management;
bool prediction_benchmarking;
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index b6d30bf..3b051f7 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -1025,9 +1025,6 @@ ThreadProxy::ScheduledActionDrawAndSwapForced() {
}
void ThreadProxy::DidAnticipatedDrawTimeChange(base::TimeTicks time) {
- if (layer_tree_host_impl_)
- layer_tree_host_impl_->SetAnticipatedDrawTime(time);
-
if (current_resource_update_controller_on_impl_thread_)
current_resource_update_controller_on_impl_thread_
->PerformMoreUpdates(time);