Update from https://crrev.com/304715

cc/resources/resource_provider.h

Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 40103f6b3e336c64f48b523d342d365ae7913168..c2f349ff05fd7b12309fce72005586d64047dbd0 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -335,9 +335,13 @@ class CC_EXPORT ResourceProvider {
                       ResourceProvider::ResourceId resource_id);
     ~ScopedWriteLockGr();
 
-    SkSurface* GetSkSurface(bool use_distance_field_text);
+    SkSurface* GetSkSurface(bool use_distance_field_text,
+                            bool can_use_lcd_text);
 
    private:
+    bool SurfaceHasMatchingProperties(bool use_distance_field_text,
+                                      bool can_use_lcd_text) const;
+
     ResourceProvider* resource_provider_;
     ResourceProvider::Resource* resource_;
     base::ThreadChecker thread_checker_;