Add flag to enable rendering of text using signed distance fields.

cc/resources/resource_provider.h

 // 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.
 
 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 57 matching lines @@
     InvalidType = 0,
     GLTexture = 1,
     Bitmap,
   };
 
   static scoped_ptr<ResourceProvider> Create(
       OutputSurface* output_surface,
       SharedBitmapManager* shared_bitmap_manager,
       int highp_threshold_min,
       bool use_rgba_4444_texture_format,
-      size_t id_allocation_chunk_size);
+      size_t id_allocation_chunk_size,
+      bool use_distance_field_text);
   virtual ~ResourceProvider();
 
   void InitializeSoftware();
   void InitializeGL();
 
   void DidLoseOutputSurface() { lost_output_surface_ = true; }
 
   int max_texture_size() const { return max_texture_size_; }
   ResourceFormat memory_efficient_texture_format() const {
     return use_rgba_4444_texture_format_ ? RGBA_4444 : best_texture_format_;
@@ skipping 384 matching lines @@
     SkCanvas* locked_canvas_;
     int canvas_save_count_;
   };
 
   class DirectRasterBuffer : public RasterBuffer {
    public:
     DirectRasterBuffer(const Resource* resource,
                        ResourceProvider* resource_provider);
     virtual ~DirectRasterBuffer();
 
+    void SetUseDistanceFieldText(bool use_distance_field_text) {
+      use_distance_field_text_ = use_distance_field_text;
+    }
+
    protected:
     virtual SkCanvas* DoLockForWrite() OVERRIDE;
     virtual bool DoUnlockForWrite() OVERRIDE;
     skia::RefPtr<SkSurface> CreateSurface();
 
    private:
     skia::RefPtr<SkSurface> surface_;
     uint32_t surface_generation_id_;
+    bool use_distance_field_text_;

[reveman, 2014/05/05 21:15:18]

Can this be "const bool" and set by the ctor instead of having
SetUseDistanceFieldText?

[jvanverth1, 2014/05/06 14:27:22]

Done.

 
     DISALLOW_COPY_AND_ASSIGN(DirectRasterBuffer);
   };
 
   class BitmapRasterBuffer : public RasterBuffer {
    public:
     virtual ~BitmapRasterBuffer();
 
    protected:
     BitmapRasterBuffer(const Resource* resource,
@@ skipping 58 matching lines @@
 
   bool ReadLockFenceHasPassed(const Resource* resource) {
     return !resource->read_lock_fence.get() ||
            resource->read_lock_fence->HasPassed();
   }
 
   ResourceProvider(OutputSurface* output_surface,
                    SharedBitmapManager* shared_bitmap_manager,
                    int highp_threshold_min,
                    bool use_rgba_4444_texture_format,
-                   size_t id_allocation_chunk_size);
+                   size_t id_allocation_chunk_size,
+                   bool use_distance_field_text);
 
   void CleanUpGLIfNeeded();
 
   Resource* GetResource(ResourceId id);
   const Resource* LockForRead(ResourceId id);
   void UnlockForRead(ResourceId id);
   const Resource* LockForWrite(ResourceId id);
   void UnlockForWrite(ResourceId id);
   static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
                                            const Resource* resource);
@@ skipping 65 matching lines @@
 
   scoped_refptr<Fence> current_read_lock_fence_;
   bool use_rgba_4444_texture_format_;
 
   const size_t id_allocation_chunk_size_;
   scoped_ptr<IdAllocator> texture_id_allocator_;
   scoped_ptr<IdAllocator> buffer_id_allocator_;
 
   bool use_sync_query_;
 
+  bool use_distance_field_text_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 
 // TODO(epenner): Move these format conversions to resource_format.h
 // once that builds on mac (npapi.h currently #includes OpenGL.h).
 inline unsigned BitsPerPixel(ResourceFormat format) {
   DCHECK_LE(format, RESOURCE_FORMAT_MAX);
   static const unsigned format_bits_per_pixel[RESOURCE_FORMAT_MAX + 1] = {
     32,  // RGBA_8888
@@ skipping 32 matching lines @@
   return format_gl_data_format[format];
 }
 
 inline GLenum GLInternalFormat(ResourceFormat format) {
   return GLDataFormat(format);
 }
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_