commit 9f6e4632f89475d572e9f82f2ca1d0a96ec37c0f
author Julia Lavrova <jlavrova@google.com> Fri Sep 17 15:19:02 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Sep 21 17:25:18 2021 +0000
tree dd555b012a6f0dc34c7fe08561f186051ede7853
parent 35bd92638faf34051ed5e391fa54d20a762015eb

Fixing all clang errors...

Change-Id: If448c339c16359b53c31f181d3e3938ffbe30cef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450037
Reviewed-by: Jorge Betancourt <jmbetancourt@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 47cb3b3..1c9765c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1477,6 +1477,10 @@
   ]
 }
 
+group("experimental") {
+  deps = [ "experimental/sktext" ]
+}
+
 config("our_vulkan_headers") {
   include_dirs = [ "include/third_party/vulkan" ]
 }
@@ -1985,6 +1989,7 @@
       ":test",
       ":tool_utils",
       "experimental/skrive:tests",
+      "experimental/sktext:tests",
       "modules/skottie:tests",
       "modules/skparagraph:tests",
       "modules/sksg:tests",
@@ -2049,6 +2054,7 @@
       ":flags",
       ":gpu_tool_utils",
       ":xml",
+      "experimental/sktext:samples",
       "modules/audioplayer",
       "modules/skparagraph:samples",
       "modules/skshaper",
@@ -2488,6 +2494,7 @@
       deps = [
         ":sk_app",
         ":skia",
+        "experimental/sktext:sktext",
         "modules/skottie:skottie",
       ]
     }
@@ -2744,6 +2751,7 @@
         ":tool_utils",
         ":trace",
         "experimental/skrive",
+        "experimental/sktext",
         "modules/audioplayer",
         "modules/particles",
         "modules/skottie",
@@ -2863,6 +2871,10 @@
       is_shared_library = is_android
       deps = [ "modules/skplaintexteditor:editor_app" ]
     }
+    test_app("text_editor") {
+      is_shared_library = is_android
+      deps = [ "experimental/sktext:text_editor" ]
+    }
   }
 
   skia_executable("image_diff_metric") {

experimental/sktext/tests/SelectableText.cpp

diff --git a/experimental/sktext/tests/SelectableText.cpp b/experimental/sktext/tests/SelectableText.cpp
index 8692eed..75caf9c 100644
--- a/experimental/sktext/tests/SelectableText.cpp
+++ b/experimental/sktext/tests/SelectableText.cpp
@@ -49,20 +49,6 @@
 
 using namespace skia::text;
 
-namespace {
-    bool operator==(SkSpan<const char16_t> a, SkSpan<const char16_t> b) {
-        if (a.size() != b.size()) {
-            return false;
-        }
-        for (size_t i = 0; i < a.size(); ++i) {
-            if (a[i] != b[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
 struct TestLine {
     size_t index;
     TextRange lineText;
@@ -87,7 +73,7 @@
 public:
     void onBeginLine(size_t index, TextRange lineText, bool hardBreak, SkRect bounds) override {
         SkASSERT(fTestLines.size() == index);
-        fTestLines.push_back({ index, lineText, hardBreak, bounds, EMPTY_RANGE, Range<RunIndex>(fTestRuns.size(), fTestRuns.size()) });
+        fTestLines.push_back({ index, lineText, hardBreak, bounds, EMPTY_RANGE, Range<RunIndex>(fTestRuns.size(), fTestRuns.size()), 0 });
     }
     void onEndLine(size_t index, TextRange lineText, GlyphRange trailingSpaces, size_t glyphCount) override {
         SkASSERT(fTestLines.size() == index + 1);

experimental/sktext/tests/ShapedText.cpp

diff --git a/experimental/sktext/tests/ShapedText.cpp b/experimental/sktext/tests/ShapedText.cpp
index d26272f..9bee2bf 100644
--- a/experimental/sktext/tests/ShapedText.cpp
+++ b/experimental/sktext/tests/ShapedText.cpp
@@ -49,20 +49,6 @@
 
 using namespace skia::text;
 
-namespace {
-    bool operator==(SkSpan<const char16_t> a, SkSpan<const char16_t> b) {
-        if (a.size() != b.size()) {
-            return false;
-        }
-        for (size_t i = 0; i < a.size(); ++i) {
-            if (a[i] != b[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
 DEF_TEST(SkText_ShapedText_LTR, reporter) {
     TrivialFontChain* fontChain = new TrivialFontChain("Roboto", 40.0f, SkFontStyle::Normal());
     if (fontChain->empty()) return;

experimental/sktext/tests/WrappedText.cpp

diff --git a/experimental/sktext/tests/WrappedText.cpp b/experimental/sktext/tests/WrappedText.cpp
index ca70b90..e1e289f 100644
--- a/experimental/sktext/tests/WrappedText.cpp
+++ b/experimental/sktext/tests/WrappedText.cpp
@@ -48,20 +48,6 @@
 #endif
 using namespace skia::text;
 
-namespace {
-    bool operator==(SkSpan<const char16_t> a, SkSpan<const char16_t> b) {
-        if (a.size() != b.size()) {
-            return false;
-        }
-        for (size_t i = 0; i < a.size(); ++i) {
-            if (a[i] != b[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
 struct TestLine {
     size_t index;
     TextRange lineText;