cc: Remove SkSurface cache from Resource

cc/resources/gpu_rasterizer.cc

Index: cc/resources/gpu_rasterizer.cc
diff --git a/cc/resources/gpu_rasterizer.cc b/cc/resources/gpu_rasterizer.cc
index 6f9786d36e5e1494c75045ea804927e27f3b1432..39cd1b11fd58cda4ac9f882b9b5a406679bff4b7 100644
--- a/cc/resources/gpu_rasterizer.cc
+++ b/cc/resources/gpu_rasterizer.cc
@@ -119,16 +119,16 @@ void GpuRasterizer::AddToMultiPictureDraw(const Tile* tile,
       use_distance_field_text_ ||
       tile->raster_source()->ShouldAttemptToUseDistanceFieldText();
   scoped_ptr<ResourceProvider::ScopedWriteLockGr> lock(
-      new ResourceProvider::ScopedWriteLockGr(resource_provider_,
-                                              resource->id()));
-  SkSurface* sk_surface = lock->GetSkSurface(
-      use_distance_field_text, tile->raster_source()->CanUseLCDText());
-
-  locks->push_back(lock.Pass());
+      new ResourceProvider::ScopedWriteLockGr(
+          resource_provider_, resource->id(), use_distance_field_text,
+          tile->raster_source()->CanUseLCDText()));
 
+  SkSurface* sk_surface = lock->get_sk_surface();
   if (!sk_surface)
     return;
 
+  locks->push_back(lock.Pass());
+
   SkRTreeFactory factory;
   SkPictureRecorder recorder;
   gfx::Size size = resource->size();