Revert of Use Opportunity Iterator to position text fragments in NGLineBuilder

third_party/WebKit/Source/core/layout/ng/ng_line_builder.h

Index: third_party/WebKit/Source/core/layout/ng/ng_line_builder.h
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h
index 6dcb0ef920414077a1ce08ed26b9437c28caffd1..fb5651b6f05a5d88834c02a8a39e1d70f497c5b5 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_line_builder.h
@@ -7,7 +7,6 @@
 
 #include "core/CoreExport.h"
 #include "core/layout/ng/geometry/ng_logical_offset.h"
-#include "core/layout/ng/ng_layout_opportunity_iterator.h"
 #include "core/layout/ng/ng_physical_fragment.h"
 #include "platform/fonts/FontBaseline.h"
 #include "platform/heap/Handle.h"
@@ -31,7 +30,7 @@
   STACK_ALLOCATED();
 
  public:
-  NGLineBuilder(NGInlineNode*, NGConstraintSpace*);
+  NGLineBuilder(NGInlineNode*, const NGConstraintSpace*);
 
   const NGConstraintSpace& ConstraintSpace() const {
     return *constraint_space_;
@@ -140,11 +139,8 @@
                            const LineItemChunk&,
                            LineBoxData*);
 
-  // Finds the next layout opportunity for the next text fragment.
-  void FindNextLayoutOpportunity();
-
   Persistent<NGInlineNode> inline_box_;
-  NGConstraintSpace* constraint_space_;  // Not owned as STACK_ALLOCATED.
+  const NGConstraintSpace* constraint_space_;  // Not owned as STACK_ALLOCATED.
   Vector<RefPtr<NGPhysicalFragment>, 32> fragments_;
   Vector<NGLogicalOffset, 32> offsets_;
   Vector<LineBoxData, 32> line_box_data_list_;
@@ -160,9 +156,6 @@
   LayoutUnit max_inline_size_;
   FontBaseline baseline_type_;
 
-  NGLogicalOffset bfc_offset_;
-  NGLogicalRect current_opportunity_;
-
 #if DCHECK_IS_ON()
   unsigned is_bidi_reordered_ : 1;
 #endif