Guard against invalid glyph shaping results

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 749 matching lines @@
 
 Vector<CharacterRange> Font::individualCharacterRanges(const TextRun& run) const
 {
     // TODO(pdr): Android is temporarily (crbug.com/577306) using the old simple
     // shaper and using the complex shaper here can show differences between
     // the two shapers. This function is currently only called through SVG
     // which now exclusively uses the complex shaper, so the primary difference
     // will be improved shaping in SVG when compared to HTML.
     FontCachePurgePreventer purgePreventer;
     CachingWordShaper shaper(m_fontFallbackList->shapeCache(m_fontDescription));
-    return shaper.individualCharacterRanges(this, run);
+    auto ranges = shaper.individualCharacterRanges(this, run);
+    DCHECK(ranges.size() == static_cast<unsigned>(run.length()));

[fs, 2016/05/28 14:08:31]

Nit: DCHECK_EQ?

[pdr., 2016/05/28 22:58:15]

Done (also have a followup to remove those unruly static cats in
https://codereview.chromium.org/2018253002 but lets land this first).

[fs, 2016/05/29 14:35:55]

Yeah, no one likes static cats...

+    return ranges;
 }
 
 float Font::floatWidthForSimpleText(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const
 {
     SimpleShaper shaper(this, run, nullptr, fallbackFonts, glyphBounds);
     shaper.advance(run.length());
     return shaper.runWidthSoFar();
 }
 
 FloatRect Font::selectionRectForSimpleText(const TextRun& run, const FloatPoint& point, int h, int from, int to, bool accountForGlyphBounds) const
@@ skipping 66 matching lines @@
 {
     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const
 {
     return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 } // namespace blink