cc: turn on distance field text on animated layers

cc/resources/resource_provider.cc

 // Copyright 2012 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/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 977 matching lines @@
 
   resource->locked_for_write = false;
   resource->dirty_image = true;
 
   // GpuMemoryBuffer provides direct access to the memory used by the GPU.
   // Read lock fences are required to ensure that we're not trying to map a
   // buffer that is currently in-use by the GPU.
   resource->read_lock_fences_enabled = true;
 }
 
+SkSurface* ResourceProvider::CreateSkSurface(ResourceId id,
+                                             bool use_distance_field_text) {
+  Resource* resource = GetResource(id);
+  DCHECK(resource->locked_for_write);
+
+  class GrContext* gr_context = GrContext();
+  // TODO(alokp): Implement TestContextProvider::GrContext().
+  if (!gr_context)
+    return nullptr;
+
+  LazyAllocate(resource);
+
+  GrBackendTextureDesc desc;
+  desc.fFlags = kRenderTarget_GrBackendTextureFlag;
+  desc.fWidth = resource->size.width();
+  desc.fHeight = resource->size.height();
+  desc.fConfig = ToGrPixelConfig(resource->format);
+  desc.fOrigin = kTopLeft_GrSurfaceOrigin;
+  desc.fTextureHandle = resource->gl_id;
+  skia::RefPtr<GrTexture> gr_texture =
+      skia::AdoptRef(gr_context->wrapBackendTexture(desc));
+  SkSurface::TextRenderMode text_render_mode =
+      use_distance_field_text ? SkSurface::kDistanceField_TextRenderMode
+                              : SkSurface::kStandard_TextRenderMode;
+  resource->sk_surface = skia::AdoptRef(SkSurface::NewRenderTargetDirect(
+      gr_texture->asRenderTarget(), text_render_mode));
+  return resource->sk_surface.get();
+}
+
 const ResourceProvider::Resource* ResourceProvider::LockForWriteToSkSurface(
     ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK_EQ(GLTexture, resource->type);
   DCHECK(CanLockForWrite(id));
 
   resource->locked_for_write = true;
+
   if (!resource->sk_surface) {
-    class GrContext* gr_context = GrContext();
-    // TODO(alokp): Implement TestContextProvider::GrContext().
-    if (!gr_context)
-      return resource;
-
-    LazyAllocate(resource);
-
-    GrBackendTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrBackendTextureFlag;
-    desc.fWidth = resource->size.width();
-    desc.fHeight = resource->size.height();
-    desc.fConfig = ToGrPixelConfig(resource->format);
-    desc.fOrigin = kTopLeft_GrSurfaceOrigin;
-    desc.fTextureHandle = resource->gl_id;
-    skia::RefPtr<GrTexture> gr_texture =
-        skia::AdoptRef(gr_context->wrapBackendTexture(desc));
-    SkSurface::TextRenderMode text_render_mode =
-        use_distance_field_text_ ? SkSurface::kDistanceField_TextRenderMode
-                                 : SkSurface::kStandard_TextRenderMode;
-    resource->sk_surface = skia::AdoptRef(SkSurface::NewRenderTargetDirect(
-        gr_texture->asRenderTarget(), text_render_mode));
+    CreateSkSurface(id, use_distance_field_text_);

[reveman, 2014/10/15 17:34:09]

Let's not bother to create the surface here if you might have to re-create it
later when you know if dff should be used or not anyhow.

   }
 
   return resource;
 }
 
 void ResourceProvider::UnlockForWriteToSkSurface(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(resource->locked_for_write);
   DCHECK_EQ(resource->exported_count, 0);
   DCHECK(resource->origin == Resource::Internal);
@@ skipping 107 matching lines @@
     : resource_provider_(resource_provider),
       resource_id_(resource_id),
       sk_surface_(resource_provider->LockForWriteToSkSurface(resource_id)
                       ->sk_surface.get()) {
 }
 
 ResourceProvider::ScopedWriteLockGr::~ScopedWriteLockGr() {
   resource_provider_->UnlockForWriteToSkSurface(resource_id_);
 }
 
+void ResourceProvider::ScopedWriteLockGr::SetUseDistanceFieldText(
+    bool use_distance_field_text) {
+  bool surface_uses_distance_field =
+      resource_provider_->use_distance_field_text_ || use_distance_field_text;

[reveman, 2014/10/15 17:34:09]

what is ResourceProvider::use_distance_field_text_ for? Can we remove it or is
the input parameter not enough?

+  // If the surface doesn't have the correct dff setting, recreate the surface
+  // within the resource.
+  if (surface_uses_distance_field !=
+      sk_surface_->props().isUseDistanceFieldFonts()) {
+    sk_surface_ = resource_provider_->CreateSkSurface(resource_id_,
+                                                      use_distance_field_text);
+  }
+}
+
 ResourceProvider::ResourceProvider(
     OutputSurface* output_surface,
     SharedBitmapManager* shared_bitmap_manager,
     GpuMemoryBufferManager* gpu_memory_buffer_manager,
     BlockingTaskRunner* blocking_main_thread_task_runner,
     int highp_threshold_min,
     bool use_rgba_4444_texture_format,
     size_t id_allocation_chunk_size,
     bool use_distance_field_text)
     : output_surface_(output_surface),
@@ skipping 927 matching lines @@
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->ContextGL() : NULL;
 }
 
 class GrContext* ResourceProvider::GrContext() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->GrContext() : NULL;
 }
 
 }  // namespace cc