Index: ui/gfx/render_text_unittest.cc |
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc |
index ca8677a35f900a6ac47c0b24c8f35bf95a75a7ee..dc53e440ead4a4d9ce5c7e4a5dcf8d12146f23e5 100644 |
--- a/ui/gfx/render_text_unittest.cc |
+++ b/ui/gfx/render_text_unittest.cc |
@@ -22,6 +22,7 @@ |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
#include "build/build_config.h" |
+#include "cc/paint/skia_paint_canvas.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/skia/include/core/SkRefCnt.h" |
#include "third_party/skia/include/core/SkSurface.h" |
@@ -3798,15 +3799,16 @@ TEST_P(RenderTextTest, TextDoesntClip) { |
const Size kCanvasSize(300, 50); |
const int kTestSize = 10; |
- sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul( |
- kCanvasSize.width(), kCanvasSize.height()); |
- Canvas canvas(surface->getCanvas(), 1.0f); |
+ std::unique_ptr<cc::PaintCanvas> paint_canvas( |
+ cc::SkiaPaintCanvas::CreateRasterZeroed(SkImageInfo::MakeN32Premul( |
+ kCanvasSize.width(), kCanvasSize.height()))); |
+ Canvas canvas(paint_canvas.get(), 1.0f); |
RenderText* render_text = GetRenderText(); |
render_text->SetHorizontalAlignment(ALIGN_LEFT); |
render_text->SetColor(SK_ColorBLACK); |
for (auto* string : kTestStrings) { |
- surface->getCanvas()->clear(SK_ColorWHITE); |
+ paint_canvas->clear(SK_ColorWHITE); |
render_text->SetText(WideToUTF16(string)); |
const Size string_size = render_text->GetStringSize(); |
render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2)); |
@@ -3823,7 +3825,7 @@ TEST_P(RenderTextTest, TextDoesntClip) { |
render_text->Draw(&canvas); |
ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width()); |
SkPixmap pixmap; |
- surface->getCanvas()->peekPixels(&pixmap); |
+ paint_canvas->peekPixels(&pixmap); |
const uint32_t* buffer = static_cast<const uint32_t*>(pixmap.addr()); |
ASSERT_NE(nullptr, buffer); |
TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(), |
@@ -3891,15 +3893,16 @@ TEST_P(RenderTextTest, TextDoesClip) { |
const Size kCanvasSize(300, 50); |
const int kTestSize = 10; |
- sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul( |
- kCanvasSize.width(), kCanvasSize.height()); |
- Canvas canvas(surface->getCanvas(), 1.0f); |
+ std::unique_ptr<cc::PaintCanvas> paint_canvas( |
+ cc::SkiaPaintCanvas::CreateRasterZeroed(SkImageInfo::MakeN32Premul( |
+ kCanvasSize.width(), kCanvasSize.height()))); |
+ Canvas canvas(paint_canvas.get(), 1.0f); |
RenderText* render_text = GetRenderText(); |
render_text->SetHorizontalAlignment(ALIGN_LEFT); |
render_text->SetColor(SK_ColorBLACK); |
for (auto* string : kTestStrings) { |
- surface->getCanvas()->clear(SK_ColorWHITE); |
+ paint_canvas->clear(SK_ColorWHITE); |
render_text->SetText(WideToUTF16(string)); |
const Size string_size = render_text->GetStringSize(); |
int fake_width = string_size.width() / 2; |
@@ -3910,7 +3913,7 @@ TEST_P(RenderTextTest, TextDoesClip) { |
render_text->Draw(&canvas); |
ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width()); |
SkPixmap pixmap; |
- surface->getCanvas()->peekPixels(&pixmap); |
+ paint_canvas->peekPixels(&pixmap); |
const uint32_t* buffer = static_cast<const uint32_t*>(pixmap.addr()); |
ASSERT_NE(nullptr, buffer); |
TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(), |