diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/cc/layers/picture_layer_impl.h | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/cc/layers/picture_layer_impl.h')
| -rw-r--r-- | chromium/cc/layers/picture_layer_impl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chromium/cc/layers/picture_layer_impl.h b/chromium/cc/layers/picture_layer_impl.h index bca8224974c..a23dbba61d7 100644 --- a/chromium/cc/layers/picture_layer_impl.h +++ b/chromium/cc/layers/picture_layer_impl.h @@ -61,7 +61,7 @@ class CC_EXPORT PictureLayerImpl const Region* GetPendingInvalidation() override; const PictureLayerTiling* GetPendingOrActiveTwinTiling( const PictureLayerTiling* tiling) const override; - TilePriority::PriorityBin GetMaxTilePriorityBin() const override; + bool HasValidTilePriorities() const override; bool RequiresHighResToDraw() const override; gfx::Rect GetEnclosingRectInTargetSpace() const override; @@ -77,7 +77,7 @@ class CC_EXPORT PictureLayerImpl WhichTree GetTree() const; // Mask-related functions. - void GetContentsResourceId(ResourceProvider::ResourceId* resource_id, + void GetContentsResourceId(ResourceId* resource_id, gfx::Size* resource_size) const override; void SetNearestNeighbor(bool nearest_neighbor); @@ -93,8 +93,6 @@ class CC_EXPORT PictureLayerImpl // Functions used by tile manager. PictureLayerImpl* GetPendingOrActiveTwinLayer() const; bool IsOnActiveOrPendingTree() const; - // Virtual for testing. - virtual bool HasValidTilePriorities() const; // Used for benchmarking RasterSource* GetRasterSource() const { return raster_source_.get(); } |