| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index be0ab06c868f6ac6fd5c95f822d4f8ad5689bea1..29ed0215347b90d22be92af43d0b62e38eb7dabe 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -95,7 +95,7 @@ struct CC_EXPORT UIResourceRequest {
|
| ~UIResourceRequest();
|
| UIResourceRequestType type;
|
| UIResourceId id;
|
| - scoped_refptr<UIResourceBitmap> bitmap;
|
| + UIResourceBitmap bitmap;
|
| };
|
|
|
| class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| @@ -283,6 +283,8 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| // Deletes a UI resource. May safely be called more than once.
|
| virtual void DeleteUIResource(UIResourceId id);
|
|
|
| + virtual gfx::Size GetUIResourceSize(UIResourceId id) const;
|
| +
|
| bool UsingSharedMemoryResources();
|
| int id() const { return tree_id_; }
|
|
|
| @@ -323,7 +325,13 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
|
|
| void DidLoseUIResources();
|
|
|
| - typedef base::hash_map<UIResourceId, UIResourceClient*> UIResourceClientMap;
|
| + struct UIResourceClientData {
|
| + UIResourceClient* client;
|
| + gfx::Size size;
|
| + };
|
| +
|
| + typedef base::hash_map<UIResourceId, UIResourceClientData>
|
| + UIResourceClientMap;
|
| UIResourceClientMap ui_resource_client_map_;
|
| int next_ui_resource_id_;
|
|
|
|
|