[LayoutNG] Misc fixes in ShapingLineBreaker

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

Index: third_party/WebKit/Source/platform/fonts/shaping/ShapingLineBreaker.h
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/ShapingLineBreaker.h b/third_party/WebKit/Source/platform/fonts/shaping/ShapingLineBreaker.h
index 9864fc2127b42c3134bca25965a1415ad4072e24..18938cb7c3377f2a067261ac7a09611381f806d6 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/ShapingLineBreaker.h
+++ b/third_party/WebKit/Source/platform/fonts/shaping/ShapingLineBreaker.h
@@ -14,6 +14,7 @@ namespace blink {
 class Font;
 class ShapeResult;
 class HarfBuzzShaper;
+class LazyLineBreakIterator;
 enum class LineBreakType;
 
 // Shapes a line of text by finding the ideal break position as indicated by the
@@ -27,12 +28,13 @@ enum class LineBreakType;
 // reshaping when absolutely necessarily and by only evaluating likely candidate
 // break opportunities instead of measuring and evaluating all possible options.
 class PLATFORM_EXPORT ShapingLineBreaker final {
+  STACK_ALLOCATED();
+
  public:
   ShapingLineBreaker(const HarfBuzzShaper*,
                      const Font*,
                      const ShapeResult*,
-                     const AtomicString,
-                     LineBreakType);
+                     const LazyLineBreakIterator*);
   ~ShapingLineBreaker() {}
 
   // Shapes a line of text by finding a valid and appropriate break opportunity
@@ -47,8 +49,7 @@ class PLATFORM_EXPORT ShapingLineBreaker final {
   const HarfBuzzShaper* shaper_;
   const Font* font_;
   const ShapeResult* result_;
-  const AtomicString locale_;
-  LineBreakType break_type_;
+  const LazyLineBreakIterator* break_iterator_;
   String text_;
 };