Do not skip ink for ideographic scripts

third_party/WebKit/Source/platform/fonts/Font.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 239 matching lines @@
   STACK_ALLOCATED()
  public:
   GlyphBufferBloberizer(const GlyphBuffer& buffer,
                         const Font* font,
                         float deviceScaleFactor)
       : m_buffer(buffer),
         m_font(font),
         m_deviceScaleFactor(deviceScaleFactor),
         m_hasVerticalOffsets(buffer.hasVerticalOffsets()),
         m_index(0),
+        m_endIndex(m_buffer.size()),
         m_blobCount(0),
         m_rotation(buffer.isEmpty() ? NoRotation : computeBlobRotation(
-                                                       buffer.fontDataAt(0))) {}
+                                                       buffer.fontDataAt(0))) {
+    if (m_buffer.hasSkipInkExceptions()) {
+      while (m_endIndex > 0 && m_buffer.isSkipInkException(m_endIndex - 1))
+        m_endIndex--;
+    }
+  }
 
-  bool done() const { return m_index >= m_buffer.size(); }
+  bool done() const { return m_index >= m_endIndex; }
   unsigned blobCount() const { return m_blobCount; }
 
   std::pair<sk_sp<SkTextBlob>, BlobRotation> next() {
     ASSERT(!done());
     const BlobRotation currentRotation = m_rotation;
 
-    while (m_index < m_buffer.size()) {
+    while (m_index < m_endIndex) {
+      if (m_buffer.hasSkipInkExceptions()) {
+        while (m_index < m_endIndex && m_buffer.isSkipInkException(m_index))
+          m_index++;
+      }
+
       const SimpleFontData* fontData = m_buffer.fontDataAt(m_index);
       ASSERT(fontData);
 
       const BlobRotation newRotation = computeBlobRotation(fontData);
       if (newRotation != m_rotation) {
         // We're switching to an orientation which requires a different rotation
         //   => emit the pending blob (and start a new one with the new
         //      rotation).
         m_rotation = newRotation;
         break;
       }
 
       const unsigned start = m_index++;
-      while (m_index < m_buffer.size() &&
-             m_buffer.fontDataAt(m_index) == fontData)
+      while (m_index < m_endIndex && m_buffer.fontDataAt(m_index) == fontData &&
+             !m_buffer.isSkipInkException(m_index))
         m_index++;
 
       appendRun(start, m_index - start, fontData);
     }
 
     m_blobCount++;
     return std::make_pair(m_builder.make(), currentRotation);
   }
 
  private:
@@ skipping 39 matching lines @@
     }
   }
 
   const GlyphBuffer& m_buffer;
   const Font* m_font;
   const float m_deviceScaleFactor;
   const bool m_hasVerticalOffsets;
 
   SkTextBlobBuilder m_builder;
   unsigned m_index;
+  unsigned m_endIndex;
   unsigned m_blobCount;
   BlobRotation m_rotation;
 };
 
 }  // anonymous namespace
 
 void Font::drawGlyphBuffer(SkCanvas* canvas,
                            const SkPaint& paint,
                            const TextRunPaintInfo& runInfo,
                            const GlyphBuffer& glyphBuffer,
@@ skipping 76 matching lines @@
     if (!numIntervals)
       return;
     DCHECK_EQ(numIntervals % 2, 0);
     intercepts.resize(numIntervals / 2);
     paint.getTextBlobIntercepts(runInfo.cachedTextBlob->get(), boundsArray,
                                 reinterpret_cast<SkScalar*>(intercepts.data()));
     return;
   }
 
   GlyphBuffer glyphBuffer;
+  // Compute skip-ink exceptions in the GlyphBuffer.
+  // Skip the computation if 8Bit(), no such characters in Latin-1.
+  if (!runInfo.run.is8Bit())
+    glyphBuffer.saveSkipInkExceptions();
   buildGlyphBuffer(runInfo, glyphBuffer);
 
   // Get the number of intervals, without copying the actual values by
   // specifying nullptr for the buffer, following the Skia allocation model for
   // retrieving text intercepts.
   int numIntervals = getInterceptsFromBloberizer(
       glyphBuffer, this, paint, deviceScaleFactor, bounds, nullptr);
   if (!numIntervals)
     return;
   DCHECK_EQ(numIntervals % 2, 0);
@@ skipping 168 matching lines @@
 
 bool Font::loadingCustomFonts() const {
   return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const {
   return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 }  // namespace blink