Deprecate the currently used NGMarginStrut in favor of the new one.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NGUnits_h
 #define NGUnits_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ng/ng_writing_mode.h"
 #include "platform/LayoutUnit.h"
@@ skipping 26 matching lines @@
 
   LayoutUnit inline_size;
   LayoutUnit block_size;
 
   NGPhysicalSize ConvertToPhysical(NGWritingMode mode) const;
   bool operator==(const NGLogicalSize& other) const;
 
   bool IsEmpty() const {
     return inline_size == LayoutUnit() || block_size == LayoutUnit();
   }
+
+ private:
+  friend class NGBlockLayoutAlgorithmTest;

[ikilpatrick, 2017/01/24 00:22:13]

can you ad a comment here as to why friend class?

[Gleb Lanbin, 2017/01/24 04:38:02]

Done.

+  NGLogicalSize(int inline_size, int block_size)
+      : inline_size(LayoutUnit(inline_size)),
+        block_size(LayoutUnit(block_size)) {}
 };
 
 inline std::ostream& operator<<(std::ostream& stream,
                                 const NGLogicalSize& value) {
   return stream << value.inline_size << "x" << value.block_size;
 }
 
 // NGLogicalOffset is the position of a rect (typically a fragment) relative to
 // its parent rect in the logical coordinate system.
 struct NGLogicalOffset {
@@ skipping 13 matching lines @@
   // @param inner_size the size of the inner rect (typically a child fragment).
   CORE_EXPORT NGPhysicalOffset
   ConvertToPhysical(NGWritingMode,
                     TextDirection,
                     NGPhysicalSize outer_size,
                     NGPhysicalSize inner_size) const;
 
   bool operator==(const NGLogicalOffset& other) const;
 
   NGLogicalOffset operator+(const NGLogicalOffset& other) const;
+  NGLogicalOffset& operator+=(const NGLogicalOffset& other);
 
-  NGLogicalOffset& operator+=(const NGLogicalOffset& other);
+  NGLogicalOffset operator-(const NGLogicalOffset& other) const;
+  NGLogicalOffset& operator-=(const NGLogicalOffset& other);
 
   bool operator>(const NGLogicalOffset& other) const;
   bool operator>=(const NGLogicalOffset& other) const;
 
   bool operator<(const NGLogicalOffset& other) const;
   bool operator<=(const NGLogicalOffset& other) const;
 
   String ToString() const;
+
+ private:
+  friend class NGBlockLayoutAlgorithmTest;

[ikilpatrick, 2017/01/24 00:22:13]

as above.

[Gleb Lanbin, 2017/01/24 04:38:02]

Done.

+  NGLogicalOffset(int inline_offset, int block_offset)
+      : inline_offset(LayoutUnit(inline_offset)),
+        block_offset(LayoutUnit(block_offset)) {}
 };
 
 CORE_EXPORT inline std::ostream& operator<<(std::ostream& os,
                                             const NGLogicalOffset& value) {
   return os << value.ToString();
 }
 
 // NGPhysicalOffset is the position of a rect (typically a fragment) relative to
 // its parent rect in the physical coordinate system.
 struct NGPhysicalOffset {
   NGPhysicalOffset() {}
   NGPhysicalOffset(LayoutUnit left, LayoutUnit top) : left(left), top(top) {}
 
   LayoutUnit left;
   LayoutUnit top;
 
   NGPhysicalOffset operator+(const NGPhysicalOffset& other) const;
   NGPhysicalOffset& operator+=(const NGPhysicalOffset& other);
+
   NGPhysicalOffset operator-(const NGPhysicalOffset& other) const;
   NGPhysicalOffset& operator-=(const NGPhysicalOffset& other);
+
+  String ToString() const {
+    return String::format("%dx%d", left.toInt(), top.toInt());
+  }
 };
 
 struct NGPhysicalSize {
   NGPhysicalSize() {}
   NGPhysicalSize(LayoutUnit width, LayoutUnit height)
       : width(width), height(height) {}
 
   LayoutUnit width;
   LayoutUnit height;
 
@@ skipping 12 matching lines @@
 };
 
 struct NGPhysicalRect {
   NGPhysicalOffset offset;
   NGPhysicalSize size;
 };
 
 // TODO(glebl): move to a separate file in layout/ng/units.
 struct CORE_EXPORT NGLogicalRect {
   NGLogicalRect() {}
+  NGLogicalRect(const NGLogicalOffset& offset, const NGLogicalSize& size)
+      : offset(offset), size(size) {}
   NGLogicalRect(LayoutUnit inline_offset,
                 LayoutUnit block_offset,
                 LayoutUnit inline_size,
                 LayoutUnit block_size)
       : offset(inline_offset, block_offset), size(inline_size, block_size) {}
 
   bool IsEmpty() const;
 
   // Whether this rectangle is contained by the provided rectangle.
   bool IsContained(const NGLogicalRect& other) const;
@@ skipping 38 matching lines @@
     kFloatLeft = 1,
     // Exclusion that is created by RIGHT float.
     kFloatRight = 2
   };
 
   // Rectangle in logical coordinates the represents this exclusion.
   NGLogicalRect rect;
 
   // Type of this exclusion.
   Type type;
+
+  bool operator==(const NGExclusion& other) const;
+  String ToString() const;
 };
 
+inline std::ostream& operator<<(std::ostream& stream,
+                                const NGExclusion& value) {
+  return stream << value.ToString();
+}
+
 struct CORE_EXPORT NGExclusions {
   // Default constructor.
   NGExclusions();
 
   // Copy constructor.
   NGExclusions(const NGExclusions& other);
 
   Vector<std::unique_ptr<const NGExclusion>> storage;
 
   // Last left/right float exclusions are used to enforce the top edge alignment
@@ skipping 47 matching lines @@
     return *this;
   }
 
   NGBoxStrut operator+(const NGBoxStrut& other) {
     NGBoxStrut result(*this);
     result += other;
     return result;
   }
 
   bool operator==(const NGBoxStrut& other) const;
+
+  String ToString() const {
+    return String::format("Inline: (%d %d) Block: (%d %d)",
+                          inline_start.toInt(), inline_end.toInt(),
+                          block_start.toInt(), block_end.toInt());
+  }
 };
 
+inline std::ostream& operator<<(std::ostream& stream, const NGBoxStrut& value) {
+  return stream << value.ToString();
+}
+
 // This struct is used for the margin collapsing calculation.
-struct CORE_EXPORT NGMarginStrut {
+// TODO(glebl): Deprecated. It's being replaced by NGMarginStrut
+struct CORE_EXPORT NGDeprecatedMarginStrut {
   LayoutUnit margin_block_start;
   LayoutUnit margin_block_end;
 
   LayoutUnit negative_margin_block_start;
   LayoutUnit negative_margin_block_end;
 
   LayoutUnit BlockEndSum() const;
 
   void AppendMarginBlockStart(const LayoutUnit& value);
   void AppendMarginBlockEnd(const LayoutUnit& value);
   void SetMarginBlockStart(const LayoutUnit& value);
   void SetMarginBlockEnd(const LayoutUnit& value);
 
   bool IsEmpty() const;
 
   String ToString() const;
 
+  bool operator==(const NGDeprecatedMarginStrut& other) const;
+};
+
+// This struct is used for the margin collapsing calculation.
+struct CORE_EXPORT NGMarginStrut {
+  LayoutUnit margin;
+  LayoutUnit negative_margin;
+
   bool operator==(const NGMarginStrut& other) const;
+
+  void Append(const LayoutUnit& value);
+
+  LayoutUnit Collapse() const;
+
+  LayoutUnit CollapseWith(const NGMarginStrut& other) const;
+
+  String ToString() const;
 };
 
 inline std::ostream& operator<<(std::ostream& stream,
                                 const NGMarginStrut& value) {
   return stream << value.ToString();
 }
 
 // Struct to represent a simple edge that has start and end.
 struct NGEdge {
   LayoutUnit start;
@@ skipping 51 matching lines @@
     if (position_matches)
       return position;
     else
       return container_size - position - length - margin_start - margin_end;
   }
 };
 
 }  // namespace blink
 
 #endif  // NGUnits_h