| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index af2f322c3dfba65f3d8e2cefd688a2c7a7491e03..e8e4e34aa8b717c4afeb1116200bb806d6298cbc 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -548,6 +548,10 @@ class CC_EXPORT ResourceProvider
|
|
|
| int tracing_id() const { return tracing_id_; }
|
|
|
| + std::vector<SharedBitmap*> TakeSharedBitmapsToRegister() {
|
| + return std::move(shared_bitmaps_to_register_);
|
| + }
|
| +
|
| private:
|
| friend class ScopedBatchReturnResources;
|
|
|
| @@ -808,6 +812,8 @@ class CC_EXPORT ResourceProvider
|
| // resource providers.
|
| int tracing_id_;
|
|
|
| + std::vector<SharedBitmap*> shared_bitmaps_to_register_;
|
| +
|
| #if defined(OS_ANDROID)
|
| // Set of resource Ids that would like to be notified about promotion hints.
|
| ResourceIdSet wants_promotion_hints_set_;
|
|
|