Refactor InspectorCSSAgent to avoid an intermediate GlyphBuffer

third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.h

 /*
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CachingWordShaper_h
 #define CachingWordShaper_h
 
+#include "platform/fonts/shaping/ShapeResultBuffer.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Allocator.h"
 #include "wtf/PassRefPtr.h"
+#include "wtf/Vector.h"
+#include <tuple>
 
 namespace blink {
 
 struct CharacterRange;
 class Font;
 class GlyphBuffer;
+class ShapeCache;
 class SimpleFontData;
-class ShapeCache;
 struct GlyphData;
 
 class PLATFORM_EXPORT CachingWordShaper final {
   STACK_ALLOCATED();
   WTF_MAKE_NONCOPYABLE(CachingWordShaper);
 
  public:
-  CachingWordShaper(ShapeCache* cache) : m_shapeCache(cache) {}
+  explicit CachingWordShaper(const Font& font) : m_font(font) {}
   ~CachingWordShaper() {}
 
-  float width(const Font*,
-              const TextRun&,
+  float width(const TextRun&,
               HashSet<const SimpleFontData*>* fallbackFonts,
               FloatRect* glyphBounds);
-  int offsetForPosition(const Font*,
-                        const TextRun&,
+  int offsetForPosition(const TextRun&,
                         float targetX,
                         bool includePartialGlyphs);
-  float fillGlyphBuffer(const Font*,
-                        const TextRun&,
-                        HashSet<const SimpleFontData*>*,
+  float fillGlyphBuffer(const TextRun&,
                         GlyphBuffer*,
                         unsigned from,
                         unsigned to);
-  float fillGlyphBufferForTextEmphasis(const Font*,
-                                       const TextRun&,
+  float fillGlyphBufferForTextEmphasis(const TextRun&,
                                        const GlyphData* emphasisData,
                                        GlyphBuffer*,
                                        unsigned from,
                                        unsigned to);
-  CharacterRange getCharacterRange(const Font*,
-                                   const TextRun&,
+  CharacterRange getCharacterRange(const TextRun&,
                                    unsigned from,
                                    unsigned to);
-  Vector<CharacterRange> individualCharacterRanges(const Font*, const TextRun&);
+  Vector<CharacterRange> individualCharacterRanges(const TextRun&);
+
+  Vector<ShapeResultBuffer::RunFontData> runFontData(const TextRun&) const;
 
  private:
-  ShapeCache* m_shapeCache;
+  ShapeCache* shapeCache() const;
+
+  const Font& m_font;
 };
 
 }  // namespace blink
 
 #endif  // CachingWordShaper_h