Utility routines for ng_units

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

 // 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.
 
 #include "core/layout/ng/ng_units.h"
 
 #include "core/layout/ng/ng_writing_mode.h"
 
 namespace blink {
 
+LayoutUnit MinAndMaxContentSizes::ShrinkToFit(LayoutUnit container_size) const {

[cbiesinger, 2016/11/11 04:31:47]

Interesting idea to add this function as a member function here! I think I like
it.

container_size -> available_size. They're not quite the same because you need to
subtract margins for this to be correct.

Also please change ResolveInlineLength to use this function.

[atotic, 2016/11/11 05:16:22]

Done.

+  return std::min(max_content, std::max(min_content, container_size));
+}
+
 NGPhysicalSize NGLogicalSize::ConvertToPhysical(NGWritingMode mode) const {
   return mode == HorizontalTopBottom ? NGPhysicalSize(inline_size, block_size)
                                      : NGPhysicalSize(block_size, inline_size);
 }
 
 bool NGLogicalSize::operator==(const NGLogicalSize& other) const {
   return std::tie(other.inline_size, other.block_size) ==
          std::tie(inline_size, block_size);
 }
 
@@ skipping 111 matching lines @@
 bool NGBoxStrut::IsEmpty() const {
   return *this == NGBoxStrut();
 }
 
 bool NGBoxStrut::operator==(const NGBoxStrut& other) const {
   return std::tie(other.inline_start, other.inline_end, other.block_start,
                   other.block_end) ==
          std::tie(inline_start, inline_end, block_start, block_end);
 }
 
+NGBoxStrut NGPhysicalBoxStrut::ConvertToLogical(NGWritingMode writing_mode,
+                                                TextDirection direction) const {

[cbiesinger, 2016/11/11 04:31:47]

This is equivalent to
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/layout/ng...
right? Can you remove the old one?

[atotic, 2016/11/11 05:16:23]

Oh man, I missed that one. Done, old one has been removed, and I cleaned up my
code a bit.

+  switch (writing_mode) {
+    case HorizontalTopBottom:
+      if (direction == LTR)
+        return NGBoxStrut{left, right, top, bottom};
+      else
+        return NGBoxStrut{right, left, top, bottom};
+    case VerticalRightLeft:
+      if (direction == LTR)
+        return NGBoxStrut{top, bottom, right, left};
+      else
+        return NGBoxStrut{bottom, top, right, left};
+    case VerticalLeftRight:
+      if (direction == LTR)
+        return NGBoxStrut{top, bottom, left, right};
+      else
+        return NGBoxStrut{bottom, top, left, right};
+    case SidewaysRightLeft:
+      if (direction == LTR)
+        return NGBoxStrut{bottom, top, left, right};
+      else
+        return NGBoxStrut{top, bottom, left, right};
+    case SidewaysLeftRight:
+      if (direction == LTR)
+        return NGBoxStrut{top, bottom, left, right};
+      else
+        return NGBoxStrut{bottom, top, left, right};
+  }
+}
+
 LayoutUnit NGMarginStrut::BlockEndSum() const {
   return margin_block_end + negative_margin_block_end;
 }
 
 void NGMarginStrut::AppendMarginBlockStart(const LayoutUnit& value) {
   if (value < 0) {
     negative_margin_block_start =
         -std::max(value.abs(), negative_margin_block_start.abs());
   } else {
     margin_block_start = std::max(value, margin_block_start);
@@ skipping 38 matching lines @@
 
 bool NGMarginStrut::operator==(const NGMarginStrut& other) const {
   return std::tie(other.margin_block_start, other.margin_block_end,
                   other.negative_margin_block_start,
                   other.negative_margin_block_end) ==
          std::tie(margin_block_start, margin_block_end,
                   negative_margin_block_start, negative_margin_block_end);
 }
 
 }  // namespace blink