diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/cc/layers/image_layer.cc | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/cc/layers/image_layer.cc')
| -rw-r--r-- | chromium/cc/layers/image_layer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/cc/layers/image_layer.cc b/chromium/cc/layers/image_layer.cc index 2f90bfc50a8..cada84df3cc 100644 --- a/chromium/cc/layers/image_layer.cc +++ b/chromium/cc/layers/image_layer.cc @@ -41,7 +41,7 @@ void ImageLayer::SetTexturePriorities(const PriorityCalculator& priority_calc) { } bool ImageLayer::Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion) { + const OcclusionTracker<Layer>* occlusion) { CreateUpdaterIfNeeded(); if (!updater_->UsingBitmap(bitmap_)) { updater_->SetBitmap(bitmap_); @@ -67,6 +67,7 @@ LayerUpdater* ImageLayer::Updater() const { void ImageLayer::CalculateContentsScale(float ideal_contents_scale, float device_scale_factor, float page_scale_factor, + float maximum_animation_contents_scale, bool animating_transform_to_screen, float* contents_scale_x, float* contents_scale_y, |