Chromium Code Reviews| Index: third_party/WebKit/Source/core/layout/ng/NGBlockLayoutAlgorithm.cpp |
| diff --git a/third_party/WebKit/Source/core/layout/ng/NGBlockLayoutAlgorithm.cpp b/third_party/WebKit/Source/core/layout/ng/NGBlockLayoutAlgorithm.cpp |
| index b7d4b998524e729517dfe869f1d7154d4d09c63e..4844dafb04ba3eff67e68b0a7c5aacf7e4ac4777 100644 |
| --- a/third_party/WebKit/Source/core/layout/ng/NGBlockLayoutAlgorithm.cpp |
| +++ b/third_party/WebKit/Source/core/layout/ng/NGBlockLayoutAlgorithm.cpp |
| @@ -4,37 +4,10 @@ |
| #include "core/layout/ng/NGBlockLayoutAlgorithm.h" |
| -#include "core/layout/LayoutBox.h" |
|
cbiesinger
2016/08/09 19:26:58
Can you keep these? My pending patch needs them :)
|
| -#include "core/layout/ng/NGConstraintSpace.h" |
| -#include "core/style/ComputedStyle.h" |
| - |
| namespace blink { |
| NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm() |
| { |
| } |
| -NGConstraintSpace NGBlockLayoutAlgorithm::createConstraintSpaceFromLayoutObject(const LayoutBox& child) |
| -{ |
| - bool fixedInline = false, fixedBlock = false; |
| - // XXX for orthogonal writing mode this is not right |
| - LayoutUnit containerLogicalWidth = std::max(LayoutUnit(), child.containingBlockLogicalWidthForContent()); |
| - // XXX Make sure this height is correct |
| - LayoutUnit containerLogicalHeight = child.containingBlockLogicalHeightForContent(ExcludeMarginBorderPadding); |
| - if (child.hasOverrideLogicalContentWidth()) { |
| - containerLogicalWidth = child.overrideLogicalContentWidth(); |
| - fixedInline = true; |
| - } |
| - if (child.hasOverrideLogicalContentHeight()) { |
| - containerLogicalWidth = child.overrideLogicalContentHeight(); |
| - fixedBlock = true; |
| - } |
| - NGConstraintSpace space(containerLogicalWidth, containerLogicalHeight); |
| - // XXX vertical writing mode |
| - space.setOverflowTriggersScrollbar(child.styleRef().overflowX() == OverflowAuto, |
| - child.styleRef().overflowY() == OverflowAuto); |
| - space.setFixedSize(fixedInline, fixedBlock); |
| - return space; |
| -} |
| - |
| } // namespace blink |