Return to save/translate/restore for drawing via SkPicture

Can't really cache (x, y) in the picture - it's coming from the paint

Change-Id: I4ff9abe19dcd5394b40af427dfab03e8c38fba0e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315648
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>

Author: Rusino

modules/skparagraph/samples/SampleParagraph.cpp

@@ -2904,8 +2904,7 @@ class ParagraphView46 : public ParagraphView_Base {
 
     void onDrawContent(SkCanvas* canvas) override {
 
-        SkString text;
-        for (auto i = 0; i < 150; ++i) text.append("XXXXXXXXXX");
+        auto text = "XXXXXXXXXX\nYYYYYYYYYY\nZZZZZZZZZZ";
         canvas->drawColor(SK_ColorWHITE);
 
         auto fontCollection = sk_make_sp<FontCollection>();
@@ -2914,24 +2913,26 @@ class ParagraphView46 : public ParagraphView_Base {
 
         ParagraphStyle paragraph_style;
 
-        auto draw = [&](DrawOptions options) {
+        auto column = width()/3;
+        auto draw = [&](DrawOptions options, SkScalar x) {
             paragraph_style.setDrawOptions(options);
             ParagraphBuilderImpl builder(paragraph_style, fontCollection);
             TextStyle text_style;
             text_style.setColor(SK_ColorBLACK);
             text_style.setFontFamilies({SkString("Roboto")});
             text_style.setFontSize(20);
             builder.pushStyle(text_style);
-            builder.addText(text.c_str());
+            builder.addText(text);
             auto paragraph = builder.Build();
-            paragraph->layout(width() / 3);
-            paragraph->paint(canvas, 0, 0);
-            canvas->translate(width() / 3, 0);
+            paragraph->layout(column);
+            paragraph->paint(canvas, x, 000);
+            paragraph->paint(canvas, x, 200);
+            paragraph->paint(canvas, x, 400);
         };
 
-        draw(DrawOptions::kReplay);
-        draw(DrawOptions::kRecord);
-        draw(DrawOptions::kDirect);
+        draw(DrawOptions::kReplay, column*0);
+        draw(DrawOptions::kRecord, column*1);
+        draw(DrawOptions::kDirect, column*2);
     }
 
 private:

modules/skparagraph/src/ParagraphImpl.cpp

@@ -212,16 +212,20 @@ void ParagraphImpl::paint(SkCanvas* canvas, SkScalar x, SkScalar y) {
 
     if (fState < kDrawn) {
         // Record the picture anyway (but if we have some pieces in the cache they will be used)
-        this->paintLinesIntoPicture(x, y);
+        this->paintLinesIntoPicture(0, 0);
         fState = kDrawn;
     }
 
     if (fParagraphStyle.getDrawOptions() == DrawOptions::kReplay) {
         // Replay the recorded picture
+        canvas->save();
+        canvas->translate(x, y);
         fPicture->playback(canvas);
+        canvas->restore();
     } else {
         // Draw the picture
-        canvas->drawPicture(fPicture);
+        SkMatrix matrix = SkMatrix::Translate(x, y);
+        canvas->drawPicture(fPicture, &matrix, nullptr);
     }
 }