Reland "SkParagraph"

This is a reland of 10ad0b9

Original change's description:
> SkParagraph
>
> Change-Id: I0a4be75fd0c18021c201bcc1edfdfad8556edeff
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/192100
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Julia Lavrova <jlavrova@google.com>

Change-Id: I46cf43eae693edf68e45345acd0eb39e04e02bfc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219863
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>

Author: Rusino

BUILD.gn

@@ -1691,6 +1691,7 @@ if (skia_enable_tools) {
       ":skvm_builders",
       ":tool_utils",
       "modules/skottie:tests",
+      "modules/skparagraph:tests",
       "modules/sksg:tests",
       "modules/skshaper",
       "//third_party/libpng",
@@ -1712,6 +1713,8 @@ if (skia_enable_tools) {
       ":skia",
       ":skvm_builders",
       ":tool_utils",
+      "modules/skshaper",
+      "modules/skparagraph:bench",
     ]
   }
 
@@ -1815,6 +1818,7 @@ if (skia_enable_tools) {
         ":flags",
         ":gpu_tool_utils",
         ":xml",
+        "modules/skparagraph:samples",
         "modules/sksg",
         "modules/skshaper",
       ]
@@ -1923,6 +1927,8 @@ if (skia_enable_tools) {
       ":tool_utils",
       ":trace",
       "modules/sksg",
+      "modules/skparagraph:bench",
+      "modules/skshaper",
     ]
   }
 

bench/ParagraphBench.cpp

@@ -0,0 +1,57 @@
+// Copyright 2019 Google LLC.
+// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+#include "bench/Benchmark.h"
+
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_GOOGLE3)
+
+#include "modules/skparagraph/include/Paragraph.h"
+#include "modules/skparagraph/src/ParagraphBuilderImpl.h"
+#include "modules/skparagraph/include/FontCollection.h"
+#include "modules/skparagraph/src/ParagraphImpl.h"
+#include "tools/Resources.h"
+
+#include <cfloat>
+
+using namespace skia::textlayout;
+namespace {
+struct ParagraphBench : public Benchmark {
+    ParagraphBench(SkScalar width, const char* r, const char* n)
+            : fResource(r), fName(n), fWidth(width) {}
+    sk_sp<SkData> fData;
+    const char* fResource;
+    const char* fName;
+    SkScalar fWidth;
+    const char* onGetName() override { return fName; }
+    bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; }
+    void onDelayedSetup() override { fData = GetResourceAsData(fResource); }
+    void onDraw(int loops, SkCanvas*) override {
+        if (!fData) {
+            return;
+        }
+
+        const char* text = (const char*)fData->data();
+
+        sk_sp<FontCollection> fontCollection = sk_make_sp<FontCollection>();
+        ParagraphStyle paragraph_style;
+        paragraph_style.turnHintingOff();
+        ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+        builder.addText(text);
+        auto paragraph = builder.Build();
+
+        while (loops-- > 0) {
+            paragraph->layout(fWidth);
+            auto impl = static_cast<ParagraphImpl*>(paragraph.get());
+            impl->formatLines(fWidth);
+        }
+    }
+};
+}  // namespace
+
+#define PARAGRAPH_BENCH(X) DEF_BENCH(return new ParagraphBench(500, "text/" #X ".txt", "paragraph_" #X);)
+//PARAGRAPH_BENCH(arabic)
+//PARAGRAPH_BENCH(emoji)
+PARAGRAPH_BENCH(english)
+#undef PARAGRAPH_BENCH
+
+#endif  // !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_GOOGLE3)

gn/bench.gni

@@ -104,7 +104,6 @@ bench_sources = [
   "$_bench/ScalarBench.cpp",
   "$_bench/ShaderMaskFilterBench.cpp",
   "$_bench/ShadowBench.cpp",
-  "$_bench/ShaperBench.cpp",
   "$_bench/ShapesBench.cpp",
   "$_bench/Sk4fBench.cpp",
   "$_bench/SkGlyphCacheBench.cpp",

infra/bots/assets/skparagraph/VERSION

@@ -0,0 +1 @@
+1

infra/bots/assets/skparagraph/common.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+"""Common vars used by scripts in this directory."""
+
+
+import os
+import sys
+
+FILE_DIR = os.path.dirname(os.path.abspath(__file__))
+INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir))
+
+sys.path.insert(0, INFRA_BOTS_DIR)
+from assets import assets
+
+ASSET_NAME = os.path.basename(FILE_DIR)
+
+
+def run(cmd):
+  """Run a command, eg. "upload" or "download". """
+  assets.main([cmd, ASSET_NAME] + sys.argv[1:])

infra/bots/assets/skparagraph/download.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+"""Download the current version of the asset."""
+
+
+import common
+
+
+if __name__ == '__main__':
+  common.run('download')

infra/bots/assets/skparagraph/upload.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+"""Upload a new version of the asset."""
+
+
+import common
+
+
+if __name__ == '__main__':
+  common.run('upload')

modules/skottie/BUILD.gn

@@ -39,8 +39,9 @@ if (skia_enable_skottie) {
 
       public_configs = [ ":utils_config" ]
       configs += [ "../../:skia_private" ]
+
       sources = [
-        "utils/SkottieUtils.cpp",
+          "utils/SkottieUtils.cpp",
       ]
       deps = [
         ":skottie",

modules/skparagraph/BUILD.gn

@@ -0,0 +1,80 @@
+# Copyright 2019 Google LLC.
+
+import("../../gn/skia.gni")
+
+declare_args() {
+  skia_enable_skparagraph = !(is_win && is_component_build)
+  paragraph_tests_enabled = true
+  paragraph_bench_enabled = false
+}
+
+if (skia_enable_skparagraph) {
+
+  config("public_config") {
+    include_dirs = [ "include" ]
+  }
+
+  component("skparagraph") {
+    import("skparagraph.gni")
+    public_configs = [ ":public_config" ]
+    public = skparagraph_public
+    if (skia_use_icu && skia_use_harfbuzz) {
+      sources = skparagraph_sources
+    } else {
+      sources = []
+    }
+    deps = [
+      "../..:skia",
+      "../skshaper",
+      "//third_party/icu",
+    ]
+  }
+
+  if (defined(is_skia_standalone) && skia_enable_tools) {
+    source_set("tests") {
+      if (skia_use_icu && skia_use_harfbuzz && paragraph_tests_enabled) {
+        testonly = true
+        sources = [
+          "//tests/SkParagraphTest.cpp"
+        ]
+        deps = [
+          "../..:skia",
+          "../..:gpu_tool_utils",
+          ":skparagraph",
+          "../skshaper",
+          "//third_party/icu",
+        ]
+      }
+    }
+
+    source_set("bench") {
+      if (skia_use_icu && skia_use_harfbuzz && paragraph_bench_enabled) {
+        testonly = true
+        sources = [
+          "//bench/ParagraphBench.cpp"
+        ]
+        deps = [
+          "../..:skia",
+          ":skparagraph",
+          "../skshaper",
+          "//third_party/icu",
+        ]
+      }
+    }
+
+    source_set("samples") {
+      if (skia_use_icu && skia_use_harfbuzz) {
+        testonly = true
+        sources = [
+          "//samplecode/SampleParagraph.cpp",
+        ]
+        deps = [
+          "../..:skia",
+          ":skparagraph",
+          "../skshaper",
+          "//third_party/icu",
+        ]
+      }
+    }
+  }
+}

modules/skparagraph/include/DartTypes.h

@@ -0,0 +1,98 @@
+// Copyright 2019 Google LLC.
+
+#ifndef DartTypes_DEFINED
+#define DartTypes_DEFINED
+
+#include "include/core/SkRect.h"
+
+namespace skia {
+namespace textlayout {
+
+enum Affinity { kUpstream, kDownstream };
+
+enum class RectHeightStyle {
+    // Provide tight bounding boxes that fit heights per run.
+    kTight,
+
+    // The height of the boxes will be the maximum height of all runs in the
+    // line. All rects in the same line will be the same height.
+    kMax,
+
+    // Extends the top and/or bottom edge of the bounds to fully cover any line
+    // spacing. The top edge of each line should be the same as the bottom edge
+    // of the line above. There should be no gaps in vertical coverage given any
+    // ParagraphStyle line_height.
+    //
+    // The top and bottom of each rect will cover half of the
+    // space above and half of the space below the line.
+    kIncludeLineSpacingMiddle,
+    // The line spacing will be added to the top of the rect.
+    kIncludeLineSpacingTop,
+    // The line spacing will be added to the bottom of the rect.
+    kIncludeLineSpacingBottom
+};
+
+enum class RectWidthStyle {
+    // Provide tight bounding boxes that fit widths to the runs of each line
+    // independently.
+    kTight,
+
+    // Extends the width of the last rect of each line to match the position of
+    // the widest rect over all the lines.
+    kMax
+};
+
+enum class TextAlign {
+    kLeft,
+    kRight,
+    kCenter,
+    kJustify,
+    kStart,
+    kEnd,
+};
+
+enum class TextDirection {
+    kRtl,
+    kLtr,
+};
+
+struct PositionWithAffinity {
+    int32_t position;
+    Affinity affinity;
+
+    PositionWithAffinity(int32_t p, Affinity a) : position(p), affinity(a) {}
+};
+
+struct TextBox {
+    SkRect rect;
+    TextDirection direction;
+
+    TextBox(SkRect r, TextDirection d) : rect(r), direction(d) {}
+};
+
+template <typename T> struct SkRange {
+    SkRange() : start(), end() {}
+    SkRange(T s, T e) : start(s), end(e) {}
+
+    T start, end;
+
+    bool operator==(const SkRange<T>& other) const {
+        return start == other.start && end == other.end;
+    }
+
+    T width() { return end - start; }
+
+    void Shift(T delta) {
+        start += delta;
+        end += delta;
+    }
+};
+
+enum class TextBaseline {
+    kAlphabetic,
+    kIdeographic,
+};
+}  // namespace textlayout
+}  // namespace skia
+
+#endif  // DartTypes_DEFINED