Fixing a bug (reusing wrong formatting state)

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

Author: Rusino

modules/skparagraph/samples/SampleParagraph.cpp

@@ -2939,6 +2939,60 @@ class ParagraphView46 : public ParagraphView_Base {
     using INHERITED = Sample;
 };
 
+class ParagraphView47 : public ParagraphView_Base {
+protected:
+    SkString name() override { return SkString("Paragraph47"); }
+
+    void onDrawContent(SkCanvas* canvas) override {
+
+    canvas->clear(SK_ColorWHITE);
+
+    SkPaint paint;
+    paint.setColor(SK_ColorRED);
+
+    auto fontCollection = sk_make_sp<FontCollection>();
+    fontCollection->setDefaultFontManager(SkFontMgr::RefDefault());
+
+    TextStyle defaultStyle;
+    defaultStyle.setForegroundColor(paint);
+
+    ParagraphStyle paraStyle;
+    paraStyle.setTextStyle(defaultStyle);
+    paraStyle.setMaxLines(1);
+    paraStyle.setEllipsis(SkString("..."));
+
+    const char* hello = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do";
+    auto builder = ParagraphBuilder::make(paraStyle, fontCollection);
+    builder->addText(hello, strlen(hello));
+
+    auto paragraph = builder->Build();
+    paragraph->layout(100);
+    paragraph->paint(canvas, 200, 200);
+
+    paragraph->layout(200);
+    paragraph->paint(canvas, 200, 300);
+
+    ParagraphStyle paraStyle2;
+    paraStyle2.setTextStyle(defaultStyle);
+    paraStyle2.setMaxLines(1);
+    paraStyle.setEllipsis(SkString(""));
+
+    auto builder2 = ParagraphBuilder::make(paraStyle, fontCollection);
+    builder2->addText(hello, strlen(hello));
+
+    auto paragraph2 = builder2->Build();
+    paragraph2->layout(100);
+    paragraph2->paint(canvas, 200, 400);
+
+    paragraph2->layout(200);
+    paragraph2->paint(canvas, 200, 500);
+    canvas->restore();
+    }
+
+private:
+    using INHERITED = Sample;
+};
+
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
@@ -2986,3 +3040,4 @@ DEF_SAMPLE(return new ParagraphView43();)
 DEF_SAMPLE(return new ParagraphView44();)
 DEF_SAMPLE(return new ParagraphView45();)
 DEF_SAMPLE(return new ParagraphView46();)
+DEF_SAMPLE(return new ParagraphView47();)

modules/skparagraph/src/ParagraphImpl.cpp

@@ -116,8 +116,9 @@ void ParagraphImpl::layout(SkScalar rawWidth) {
         fState >= kLineBroken &&
          fLines.size() == 1 && fLines.front().ellipsis() == nullptr) {
         // Most common case: one line of text (and one line is never justified, so no cluster shifts)
+        // We cannot mark it as kLineBroken because the new width can be bigger than the old width
         fWidth = floorWidth;
-        fState = kLineBroken;
+        fState = kMarked;
     } else if (fState >= kLineBroken && fOldWidth != floorWidth) {
         // We can use the results from SkShaper but have to do EVERYTHING ELSE again
         fState = kShaped;