Fix placeholders in cache

Change-Id: I36d488aa7a554131b8e524beeabc4ca9f5777591
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267696
Reviewed-by: Ben Wagner <[email protected]>
Commit-Queue: Julia Lavrova <[email protected]>

Author: Rusino

modules/skparagraph/src/ParagraphCache.cpp

@@ -56,11 +56,18 @@ uint32_t ParagraphCache::KeyHash::mix(uint32_t hash, uint32_t data) const {
 uint32_t ParagraphCache::KeyHash::operator()(const ParagraphCacheKey& key) const {
     uint32_t hash = 0;
     for (auto& ph : key.fPlaceholders) {
+        if (&ph == &key.fPlaceholders.back()) {
+            // Skip the last "dummy" placeholder
+            break;
+        }
         hash = mix(hash, SkGoodHash()(ph.fRange.start));
         hash = mix(hash, SkGoodHash()(ph.fRange.end));
         hash = mix(hash, SkGoodHash()(relax(ph.fStyle.fBaselineOffset)));
         hash = mix(hash, SkGoodHash()(ph.fStyle.fBaseline));
         hash = mix(hash, SkGoodHash()(ph.fStyle.fAlignment));
+        if (ph.fStyle.fAlignment == PlaceholderAlignment::kBaseline) {
+            hash = mix(hash, SkGoodHash()(relax(ph.fStyle.fBaselineOffset)));
+        }
         hash = mix(hash, SkGoodHash()(relax(ph.fStyle.fHeight)));
         hash = mix(hash, SkGoodHash()(relax(ph.fStyle.fWidth)));
     }
@@ -99,8 +106,8 @@ bool operator==(const ParagraphCacheKey& a, const ParagraphCacheKey& b) {
         return false;
     }
 
-    if (!(a.fParagraphStyle == b.fParagraphStyle)) {
-        // This is too strong, but at least we will not lose lines
+    // There is no need to compare default paragraph styles - they are included into fTextStyles
+    if (a.fParagraphStyle.getHeight() != b.fParagraphStyle.getHeight()) {
         return false;
     }
 
@@ -120,7 +127,7 @@ bool operator==(const ParagraphCacheKey& a, const ParagraphCacheKey& b) {
             return false;
         }
     }
-    for (size_t i = 0; i < a.fPlaceholders.size(); ++i) {
+    for (size_t i = 0; i < a.fPlaceholders.size() - 1; ++i) {
         auto& tsa = a.fPlaceholders[i];
         auto& tsb = b.fPlaceholders[i];
         if (!(tsa.fStyle.equals(tsb.fStyle))) {
@@ -222,6 +229,7 @@ bool ParagraphCache::findParagraph(ParagraphImpl* paragraph) {
     SkAutoMutexExclusive lock(fParagraphMutex);
     ParagraphCacheKey key(paragraph);
     std::unique_ptr<Entry>* entry = fLRUCacheMap.find(key);
+
     if (!entry) {
         // We have a cache miss
 #ifdef PARAGRAPH_CACHE_STATS

modules/skparagraph/src/TextStyle.cpp

@@ -183,7 +183,8 @@ bool PlaceholderStyle::equals(const PlaceholderStyle& other) const {
            SkScalarNearlyEqual(fHeight, other.fHeight) &&
            fAlignment == other.fAlignment &&
            fBaseline == other.fBaseline &&
-           SkScalarNearlyEqual(fBaselineOffset, other.fBaselineOffset);
+           (fAlignment != PlaceholderAlignment::kBaseline ||
+            SkScalarNearlyEqual(fBaselineOffset, other.fBaselineOffset));
 }
 
 }  // namespace textlayout