commit a86712ac43803419cc85dfa00d0a76d02c413d92
author Morten Stenshorne <mstensho@chromium.org> Thu Nov 08 13:02:39 2018
committer Commit Bot <commit-bot@chromium.org> Thu Nov 08 13:02:39 2018
tree ad7e086978f306667f760fb98572d14f0a4c2bb6
parent da06a02d93545183bc626dc6ec6f67ceeb50fb4f

[LayoutNG] Deduplicate code in CreateExclusionShapeData().

Change-Id: I6017cfa22dd176e88b6b6e64a3f594173e2851a2
Reviewed-on: https://chromium-review.googlesource.com/c/1326141
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606432}

third_party/blink/renderer/core/layout/ng/ng_floats_utils.cc

diff --git a/third_party/blink/renderer/core/layout/ng/ng_floats_utils.cc b/third_party/blink/renderer/core/layout/ng/ng_floats_utils.cc
index 818ac0b..834c45d 100644
--- a/third_party/blink/renderer/core/layout/ng/ng_floats_utils.cc
+++ b/third_party/blink/renderer/core/layout/ng/ng_floats_utils.cc
@@ -118,25 +118,15 @@
     case CSSBoxType::kBorder:
       break;
     case CSSBoxType::kPadding:
-      shape_insets =
-          ComputeBorders(CreateConstraintSpaceForFloat(
-                             float_available_size, float_percentage_size,
-                             float_replaced_percentage_size, unpositioned_float,
-                             parent_space),
-                         style)
-              .ConvertToPhysical(style.GetWritingMode(), style.Direction())
-              .ConvertToLogical(parent_space.GetWritingMode(),
-                                TextDirection::kLtr);
-      break;
     case CSSBoxType::kContent:
       const NGConstraintSpace space = CreateConstraintSpaceForFloat(
           float_available_size, float_percentage_size,
           float_replaced_percentage_size, unpositioned_float, parent_space);
-      NGBoxStrut border_padding =
-          ComputeBorders(space, style) + ComputePadding(space, style);
+      NGBoxStrut strut = ComputeBorders(space, style);
+      if (style.ShapeOutside()->CssBox() == CSSBoxType::kContent)
+        strut += ComputePadding(space, style);
       shape_insets =
-          border_padding
-              .ConvertToPhysical(style.GetWritingMode(), style.Direction())
+          strut.ConvertToPhysical(style.GetWritingMode(), style.Direction())
               .ConvertToLogical(parent_space.GetWritingMode(),
                                 TextDirection::kLtr);
       break;