| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index dc8e7b6cacada7f462c89cc7ee81ec7f215def4c..b64b71f911dec5eeca9a645a5e7260b986b5fcfc 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -328,12 +328,11 @@ class CC_EXPORT ResourceProvider {
|
| ResourceProvider::ResourceId resource_id);
|
| ~ScopedWriteLockGr();
|
|
|
| - SkSurface* sk_surface() { return sk_surface_; }
|
| + SkSurface* GetSkSurface(bool use_distance_field_text);
|
|
|
| private:
|
| ResourceProvider* resource_provider_;
|
| ResourceProvider::ResourceId resource_id_;
|
| - SkSurface* sk_surface_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGr);
|
| };
|
| @@ -500,7 +499,7 @@ class CC_EXPORT ResourceProvider {
|
| void UnlockForWrite(ResourceId id);
|
| const Resource* LockForWriteToGpuMemoryBuffer(ResourceId id);
|
| void UnlockForWriteToGpuMemoryBuffer(ResourceId id);
|
| - const Resource* LockForWriteToSkSurface(ResourceId id);
|
| + void LockForWriteToSkSurface(ResourceId id);
|
| void UnlockForWriteToSkSurface(ResourceId id);
|
|
|
| static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
|
|
|