cc: turn on distance field text on animated layers

cc/resources/gpu_raster_worker_pool.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/gpu_raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/output/context_provider.h"
@@ skipping 18 matching lines @@
                    SkMultiPictureDraw* multi_picture_draw)
       : lock_(resource_provider, resource->id()),
         resource_(resource),
         multi_picture_draw_(multi_picture_draw) {}
 
   // Overridden from RasterBuffer:
   virtual void Playback(const PicturePileImpl* picture_pile,
                         const gfx::Rect& rect,
                         float scale,
                         RenderingStatsInstrumentation* stats) override {
-    if (!lock_.sk_surface())
+    // Turn on distance fields for layers that have ever animated.
+    bool use_distance_field_text =
+        picture_pile->will_be_used_for_transform_animation();

[reveman, 2014/10/20 18:38:29]

This line should also take LayerTreeSettings::use_distance_field_text into
account. See my resource provider comment for more details.

+    SkSurface* sk_surface = lock_.GetSkSurface(use_distance_field_text);
+
+    if (!sk_surface)
       return;
 
     SkPictureRecorder recorder;
     gfx::Size size = resource_->size();
     skia::RefPtr<SkCanvas> canvas =
         skia::SharePtr(recorder.beginRecording(size.width(), size.height()));
 
     canvas->save();
     picture_pile->RasterToBitmap(canvas.get(), rect, scale, stats);
     canvas->restore();
 
     // Add the canvas and recorded picture to |multi_picture_draw_|.
     skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
-    multi_picture_draw_->add(lock_.sk_surface()->getCanvas(), picture.get());
+    multi_picture_draw_->add(sk_surface->getCanvas(), picture.get());
   }
 
  private:
   ResourceProvider::ScopedWriteLockGr lock_;
   const Resource* resource_;
   SkMultiPictureDraw* multi_picture_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
 };
 
@@ skipping 162 matching lines @@
 
   ScopedGpuRaster gpu_raster(context_provider_);
   task_graph_runner_->RunUntilIdle();
 
   // Draw each all of the pictures that were collected.  This will also clear
   // the pictures and canvases added to |multi_picture_draw_|
   multi_picture_draw_.draw();
 }
 
 }  // namespace cc