commit 916a904fb7f2c827ac207e6ae7ecfce53ee85f55
author Julia Lavrova <jlavrova@google.com> Thu Aug 08 16:51:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 20 18:24:40 2019 +0000
tree 740533141b50d2768ab007159f4e34662de4f689
parent 8f3bd77699b789295b9e5bc4af1fd375a821de9f

Placeholders implementation + unit tests

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

modules/skparagraph/src/ParagraphCache.cpp

diff --git a/modules/skparagraph/src/ParagraphCache.cpp b/modules/skparagraph/src/ParagraphCache.cpp
index 465b9bc..80da392 100644
--- a/modules/skparagraph/src/ParagraphCache.cpp
+++ b/modules/skparagraph/src/ParagraphCache.cpp
@@ -58,9 +58,13 @@
         }
     }
     for (auto& ts : key.fTextStyles) {
-        hash = mix(hash, SkGoodHash()(ts.fStyle.getLetterSpacing()));
-        hash = mix(hash, SkGoodHash()(ts.fStyle.getWordSpacing()));
-        hash = mix(hash, SkGoodHash()(ts.fRange));
+        if (!ts.fStyle.isPlaceholder()) {
+            hash = mix(hash, SkGoodHash()(ts.fStyle.getLetterSpacing()));
+            hash = mix(hash, SkGoodHash()(ts.fStyle.getWordSpacing()));
+            hash = mix(hash, SkGoodHash()(ts.fRange));
+        } else {
+            // TODO: cache placeholders
+        }
     }
     hash = mix(hash, SkGoodHash()(key.fText));
     return hash;
@@ -99,17 +103,24 @@
     for (size_t i = 0; i < a.fTextStyles.size(); ++i) {
         auto& tsa = a.fTextStyles[i];
         auto& tsb = b.fTextStyles[i];
-        if (tsa.fStyle.getLetterSpacing() != tsb.fStyle.getLetterSpacing()) {
+        if (!(tsa.fStyle == tsb.fStyle)) {
             return false;
         }
-        if (tsa.fStyle.getWordSpacing() != tsb.fStyle.getWordSpacing()) {
-            return false;
-        }
-        if (tsa.fRange.width() != tsb.fRange.width()) {
-            return false;
-        }
-        if (tsa.fRange.start != tsb.fRange.start) {
-            return false;
+        if (!tsa.fStyle.isPlaceholder()) {
+            if (tsa.fStyle.getLetterSpacing() != tsb.fStyle.getLetterSpacing()) {
+                return false;
+            }
+            if (tsa.fStyle.getWordSpacing() != tsb.fStyle.getWordSpacing()) {
+                return false;
+            }
+            if (tsa.fRange.width() != tsb.fRange.width()) {
+                return false;
+            }
+            if (tsa.fRange.start != tsb.fRange.start) {
+                return false;
+            }
+        } else {
+            // TODO: compare placeholders
         }
     }