Simplify exposed API of HarfBuzzShaper

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

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * 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 HarfBuzzShaper_h
 #define HarfBuzzShaper_h
 
-#include "platform/fonts/FontDescription.h"
 #include "platform/fonts/shaping/ShapeResult.h"
-#include "platform/geometry/FloatPoint.h"
-#include "platform/geometry/FloatRect.h"
 #include "platform/text/TextRun.h"
 #include "wtf/Allocator.h"
 #include "wtf/Deque.h"
-#include "wtf/HashSet.h"
 #include "wtf/Vector.h"
-#include "wtf/text/CharacterNames.h"
 #include <hb.h>
 #include <memory>
 #include <unicode/uscript.h>
 
 namespace blink {
 
 class Font;
 class SimpleFontData;
 class HarfBuzzShaper;
 class UnicodeRangeSet;
@@ skipping 76 matching lines @@
 // Now this sub run is successfully processed and can be appended to
 // ShapeResult. A new ShapeResult::RunInfo is created. The logic in
 // insertRunIntoShapeResult then takes care of merging the shape result into
 // the right position the vector of RunInfos in ShapeResult.
 //
 // Shaping then continues analogously for the remaining Hiragana Japanese
 // sub-run, and the result is inserted into ShapeResult as well.
 class PLATFORM_EXPORT HarfBuzzShaper final {
  public:
   HarfBuzzShaper(const TextRun&);
-  PassRefPtr<ShapeResult> shapeResult(const Font*);
+  PassRefPtr<ShapeResult> shapeResult(const Font*) const;
   ~HarfBuzzShaper() {}
 
   enum HolesQueueItemAction { HolesQueueNextFont, HolesQueueRange };
 
   struct HolesQueueItem {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     HolesQueueItemAction m_action;
     unsigned m_startIndex;
     unsigned m_numCharacters;
     HolesQueueItem(HolesQueueItemAction action, unsigned start, unsigned num)
         : m_action(action), m_startIndex(start), m_numCharacters(num){};
   };
 
-  using FeaturesVector = Vector<hb_feature_t, 6>;
-
  private:
-  inline bool shapeRange(hb_buffer_t*,
-                         const Font*,
-                         const FeaturesVector&,
-                         const SimpleFontData*,
-                         PassRefPtr<UnicodeRangeSet>,
-                         UScriptCode,
-                         hb_language_t);
   bool extractShapeResults(hb_buffer_t*,
                            ShapeResult*,
                            bool& fontCycleQueued,
                            Deque<HolesQueueItem>*,
                            const HolesQueueItem&,
                            const Font*,
                            const SimpleFontData*,
                            UScriptCode,
-                           bool isLastResort);
+                           bool isLastResort) const;
   bool collectFallbackHintChars(const Deque<HolesQueueItem>&,
-                                Vector<UChar32>& hint);
+                                Vector<UChar32>& hint) const;
 
   void insertRunIntoShapeResult(
       ShapeResult*,
       std::unique_ptr<ShapeResult::RunInfo> runToInsert,
       unsigned startGlyph,
       unsigned numGlyphs,
       hb_buffer_t*);
 
   const TextRun& m_textRun;
   std::unique_ptr<UChar[]> m_normalizedBuffer;
   unsigned m_normalizedBufferLength;
 };
 
 }  // namespace blink
 
 #endif  // HarfBuzzShaper_h