Commit 8f7ee69a authored by skobes@chromium.org's avatar skobes@chromium.org

Autosize flex boxes.

BUG=341119

Review URL: https://codereview.chromium.org/328933002

git-svn-id: svn://svn.chromium.org/blink/trunk@176074 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a50f68a5
......@@ -738,7 +738,6 @@ crbug.com/368560 [ Win ] http/tests/svg/image-fetch-fail.svg [ Timeout Pass ]
crbug.com/253763 fast/text-autosizing/first-line-scale-factor.html [ ImageOnlyFailure ]
# FIXME(crbug.com/302005): Remove these as expectations are updated or the fasttextautosizer improves.
crbug.com/322782 fast/text-autosizing/cluster-inline-grid-flex-box.html [ ImageOnlyFailure ]
crbug.com/322782 fast/text-autosizing/cluster-list-item.html [ ImageOnlyFailure ]
crbug.com/302005 fast/text-autosizing/nested-child.html [ ImageOnlyFailure ]
crbug.com/322782 fast/text-autosizing/narrow-descendants-combined.html [ ImageOnlyFailure ]
......
......@@ -26,6 +26,7 @@
#include "core/rendering/RenderDeprecatedFlexibleBox.h"
#include "core/frame/UseCounter.h"
#include "core/rendering/FastTextAutosizer.h"
#include "core/rendering/LayoutRepainter.h"
#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderView.h"
......@@ -270,6 +271,8 @@ void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren)
updateLogicalWidth();
updateLogicalHeight();
FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
if (previousSize != size()
|| (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOrient() == HORIZONTAL
&& parent()->style()->boxAlign() == BSTRETCH))
......
......@@ -31,6 +31,7 @@
#include "config.h"
#include "core/rendering/RenderFlexibleBox.h"
#include "core/rendering/FastTextAutosizer.h"
#include "core/rendering/LayoutRepainter.h"
#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderView.h"
......@@ -240,6 +241,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren)
setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
{
FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
LayoutStateMaintainer statePusher(*this, locationOffset());
m_numberOfInFlowChildrenOnFirstLine = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment