diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/cc/layers/picture_layer_impl.h | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/layers/picture_layer_impl.h')
| -rw-r--r-- | chromium/cc/layers/picture_layer_impl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/cc/layers/picture_layer_impl.h b/chromium/cc/layers/picture_layer_impl.h index bc3dc37cf55..ebc2c8bdbeb 100644 --- a/chromium/cc/layers/picture_layer_impl.h +++ b/chromium/cc/layers/picture_layer_impl.h @@ -27,9 +27,8 @@ class AppendQuadsData; class MicroBenchmarkImpl; class Tile; -class CC_EXPORT PictureLayerImpl - : public LayerImpl, - NON_EXPORTED_BASE(public PictureLayerTilingClient) { +class CC_EXPORT PictureLayerImpl : public LayerImpl, + public PictureLayerTilingClient { public: static std::unique_ptr<PictureLayerImpl> Create(LayerTreeImpl* tree_impl, int id, Layer::LayerMaskType mask_type) { @@ -76,7 +75,7 @@ class CC_EXPORT PictureLayerImpl WhichTree GetTree() const; // Mask-related functions. - void GetContentsResourceId(ResourceId* resource_id, + void GetContentsResourceId(viz::ResourceId* resource_id, gfx::Size* resource_size, gfx::SizeF* resource_uv_size) const override; |