Revert of [CSS Shapes] Properly shrink boxes to avoid shape-outside

Revert of [CSS Shapes] Properly shrink boxes to avoid shape-outside (patchset #3 id:40001 of https://codereview.chromium.org/839843004/)

Reason for revert:
Caused layout issues on ibm.com. crbug.com/463040

Original issue's description:
> [CSS Shapes] Properly shrink boxes to avoid shape-outside
> 
> To determine how much an box needs to shink to avoid a float, the code
> was only taking into account the first line of the box. This doesn't
> work when the float has a shape, as it can make it seem like there is
> more space on the line than there actually is. This patch changes the
> calculations to take into account the entire height of the box that
> needs to be shrunk, and thus computes the correct amount of space
> available.
> 
> This is a merge of http://trac.webkit.org/changeset/178045 and
> http://trac.webkit.org/changeset/178064 by Bem Jones-Bey <bjonesbe@adobe.com>;.
> 
> BUG=427989
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=188850

TBR=bjonesbe@adobe.com,rob.buis@samsung.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=427989
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=193051

[leviw_travelin_and_unemployed, 2015-04-02 19:36:31]

Created Revert of [CSS Shapes] Properly shrink boxes to avoid shape-outside

[commit-bot: I haz the power, 2015-04-02 19:37:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1054063004/1

[commit-bot: I haz the power, 2015-04-02 19:38:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-04-02 19:38:31]

Failed to apply patch for Source/core/rendering/RenderBox.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: Source/core/rendering/RenderBox.cpp
  |diff --git a/Source/core/rendering/RenderBox.cpp
b/Source/core/rendering/RenderBox.cpp
  |index
9aaddd7f22fb7ecad4ff8baedaaca3eb57fe255d..b4c3939d511b886855b77a039883d27d13d96512
100644
  |--- a/Source/core/rendering/RenderBox.cpp
  |+++ b/Source/core/rendering/RenderBox.cpp
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Patch:       Source/core/rendering/RenderBox.cpp
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp
b/Source/core/rendering/RenderBox.cpp
index
9aaddd7f22fb7ecad4ff8baedaaca3eb57fe255d..b4c3939d511b886855b77a039883d27d13d96512
100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -1458,15 +1458,14 @@
     LayoutUnit logicalTopPosition = logicalTop();
     LayoutUnit startOffsetForContent = cb->startOffsetForContent();
     LayoutUnit endOffsetForContent = cb->endOffsetForContent();
-    LayoutUnit logicalHeight = cb->logicalHeightForChild(*this);
-    LayoutUnit startOffsetForLine = cb->startOffsetForLine(logicalTopPosition,
false, logicalHeight);
-    LayoutUnit endOffsetForLine = cb->endOffsetForLine(logicalTopPosition,
false, logicalHeight);
+    LayoutUnit startOffsetForLine = cb->startOffsetForLine(logicalTopPosition,
false);
+    LayoutUnit endOffsetForLine = cb->endOffsetForLine(logicalTopPosition,
false);
 
     // If there aren't any floats constraining us then allow the margins to
shrink/expand the width as much as they want.
     if (startOffsetForContent == startOffsetForLine && endOffsetForContent ==
endOffsetForLine)
-        return cb->availableLogicalWidthForLine(logicalTopPosition, false,
logicalHeight) - childMarginStart - childMarginEnd;
-
-    LayoutUnit width = cb->availableLogicalWidthForLine(logicalTopPosition,
false, logicalHeight) - std::max(LayoutUnit(), childMarginStart) -
std::max(LayoutUnit(), childMarginEnd);
+        return cb->availableLogicalWidthForLine(logicalTopPosition, false) -
childMarginStart - childMarginEnd;
+
+    LayoutUnit width = cb->availableLogicalWidthForLine(logicalTopPosition,
false) - std::max(LayoutUnit(), childMarginStart) - std::max(LayoutUnit(),
childMarginEnd);
     // We need to see if margins on either the start side or the end side can
contain the floats in question. If they can,
     // then just using the line width is inaccurate. In the case where a float
completely fits, we don't need to use the line
     // offset at all, but can instead push all the way to the content edge of
the containing block. In the case where the float

[leviw_travelin_and_unemployed, 2015-04-02 19:57:17]

The CQ bit was checked by leviw@chromium.org

[commit-bot: I haz the power, 2015-04-02 19:58:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1054063004/250001

[commit-bot: I haz the power, 2015-04-02 19:59:17]

Committed patchset #2 (id:250001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=193051