Make NGInlineItemsBuilder construct whitespace-collapsed offset mapping

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h

Index: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h
index 9f295706ea0b3e1cdb2b3afe22068a496810b9bc..be032dd285bc8985a653df4a1f3625365f0155c2 100644
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_items_builder.h
@@ -17,6 +17,7 @@ namespace blink {
 class ComputedStyle;
 class LayoutObject;
 class NGInlineItem;
+class NGOffsetMappingBuilder;
 
 // NGInlineItemsBuilder builds a string and a list of NGInlineItem from inlines.
 //
@@ -31,7 +32,11 @@ class CORE_EXPORT NGInlineItemsBuilder {
   STACK_ALLOCATED();
 
  public:
-  explicit NGInlineItemsBuilder(Vector<NGInlineItem>* items) : items_(items) {}
+  explicit NGInlineItemsBuilder(Vector<NGInlineItem>* items)
+      : items_(items), mapping_builder_(nullptr) {}
+  explicit NGInlineItemsBuilder(Vector<NGInlineItem>* items,
+                                NGOffsetMappingBuilder* mapping_builder)
+      : items_(items), mapping_builder_(mapping_builder) {}
   ~NGInlineItemsBuilder();
 
   String ToString();
@@ -92,6 +97,8 @@ class CORE_EXPORT NGInlineItemsBuilder {
   bool is_svgtext_ = false;
   bool has_bidi_controls_ = false;
 
+  NGOffsetMappingBuilder* mapping_builder_;

[yosin_UTC9, 2017/06/22 03:31:04]

nit: s/NGOffsetMappingBuilder*/NGOffsetMappingBuilder* const/

[Xiaocheng, 2017/06/22 03:36:10]

Will do.

+
   void AppendWithWhiteSpaceCollapsing(const String&,
                                       unsigned start,
                                       unsigned end,