summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 19:11:55 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 19:11:55 +0000
commite56939835d6209f977a6facb151e7311a77056ec (patch)
tree86c00e11bd47355353d87f859b46680425b98026 /cc
parent66400495bac26f574db809e951a2c4cf8d55aa8b (diff)
downloadchromium_src-e56939835d6209f977a6facb151e7311a77056ec.zip
chromium_src-e56939835d6209f977a6facb151e7311a77056ec.tar.gz
chromium_src-e56939835d6209f977a6facb151e7311a77056ec.tar.bz2
cc: Correct scale naming in UpdateTilePriorities
R=danakj@chromium.org BUG=none Review URL: https://codereview.chromium.org/373603009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/resources/picture_layer_tiling.cc4
-rw-r--r--cc/resources/picture_layer_tiling.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index fb68cbb..1101f23 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -419,7 +419,7 @@ gfx::Rect PictureLayerTiling::ComputeSkewport(
void PictureLayerTiling::UpdateTilePriorities(
WhichTree tree,
const gfx::Rect& visible_layer_rect,
- float layer_contents_scale,
+ float ideal_contents_scale,
double current_frame_time_in_seconds,
const OcclusionTracker<LayerImpl>* occlusion_tracker,
const LayerImpl* render_target,
@@ -469,7 +469,7 @@ void PictureLayerTiling::UpdateTilePriorities(
TilePriority now_priority(resolution_, TilePriority::NOW, 0);
float content_to_screen_scale =
- 1.0f / (contents_scale_ * layer_contents_scale);
+ 1.0f / (contents_scale_ * ideal_contents_scale);
// Assign now priority to all visible tiles.
bool include_borders = true;
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 108b922..6f99c13 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -212,7 +212,7 @@ class CC_EXPORT PictureLayerTiling {
void UpdateTilePriorities(
WhichTree tree,
const gfx::Rect& visible_layer_rect,
- float layer_contents_scale,
+ float ideal_contents_scale,
double current_frame_time_in_seconds,
const OcclusionTracker<LayerImpl>* occlusion_tracker,
const LayerImpl* render_target,