| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index b5dccc8f046a71c6a2a33906d745d37727b05ca6..29647e227ceaa360d6ef9777ae4db97ff5bfbd83 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -354,9 +354,10 @@ class CC_EXPORT ResourceProvider {
|
| uint8_t* pixels;
|
| uint8_t* pixel_buffer;
|
| int lock_for_read_count;
|
| + int imported_count;
|
| + int exported_count;
|
| bool locked_for_write;
|
| bool external;
|
| - bool exported;
|
| bool marked_for_deletion;
|
| bool pending_set_pixels;
|
| bool set_pixels_completion_forced;
|
| @@ -399,7 +400,7 @@ class CC_EXPORT ResourceProvider {
|
| static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
|
| const Resource* resource);
|
|
|
| - bool TransferResource(WebKit::WebGraphicsContext3D* context,
|
| + void TransferResource(WebKit::WebGraphicsContext3D* context,
|
| ResourceId id,
|
| TransferableResource* resource);
|
| enum DeleteStyle {
|
|
|