[go: nahoru, domu]

cc/paint: Remove paint wrapping of SkTextBlob and friends.

This was initially added to ensure that the typefaces embedded in a blob
were stored in a sidelist on the blob, in order to enable serialization
of typefaces for OOP raster. This is no longer required and the wrapping
is just unnecessary overhead.

R=drott@chromium.org,enne@chromium.org

Bug: 816445,894200
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_layout_tests_layout_ng;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I76f106d13ce1aa04a50aadb0d4faa98dafe7a688
Reviewed-on: https://chromium-review.googlesource.com/c/1289571
Commit-Queue: Khushal <khushalsagar@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601359}
diff --git a/cc/paint/paint_canvas.h b/cc/paint/paint_canvas.h
index 9b2bc6b..f846506 100644
--- a/cc/paint/paint_canvas.h
+++ b/cc/paint/paint_canvas.h
@@ -11,8 +11,8 @@
 #include "build/build_config.h"
 #include "cc/paint/paint_export.h"
 #include "cc/paint/paint_image.h"
-#include "cc/paint/paint_text_blob.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkTextBlob.h"
 
 namespace cc {
 class SkottieWrapper;
@@ -140,7 +140,7 @@
                            const SkRect& dst,
                            float t) = 0;
 
-  virtual void drawTextBlob(scoped_refptr<PaintTextBlob> blob,
+  virtual void drawTextBlob(sk_sp<SkTextBlob> blob,
                             SkScalar x,
                             SkScalar y,
                             const PaintFlags& flags) = 0;