ChangeLog

2014-02-17  Radu Stavila  <stavila@adobe.com>

        [CSS Regions] Move specific named flow methods from RenderRegion to RenderNamedFlowFragment

        https://bugs.webkit.org/show_bug.cgi?id=128914

        Reviewed by NOBODY (OOPS!).

        Moved named flow specific methods regionContainer() and regionContainerLayer() from 

        RenderRegion to RenderNamedFlowFragment and renamed them to fragmentContainer and

        fragmentContainerLayer.

        No new tests required.

        * rendering/RenderLayer.cpp:

        (WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):

        (WebCore::RenderLayer::calculateClipRects):

        * rendering/RenderNamedFlowFragment.cpp:

        (WebCore::RenderNamedFlowFragment::fragmentContainer):

        (WebCore::RenderNamedFlowFragment::fragmentContainerLayer):

        * rendering/RenderNamedFlowFragment.h:

        * rendering/RenderRegion.cpp:

        * rendering/RenderRegion.h:

2014-02-17  Manuel Rego Casasnovas  <rego@igalia.com>

        [CSS Grid Layout] Fix missing layout in flexible and content sized columns

Source/WebCore/rendering/RenderLayer.cpp

@@void RenderLayer::updateClipRects(const ClipRectsContext& clipRectsContext)

void RenderLayer::mapLayerClipRectsToFragmentationLayer(RenderRegion* region, ClipRects& clipRects) const

{

5255 ASSERT(region && region->parent() && region->parent()->isRenderNamedFlowFragmentContainer());

    ASSERT(region && region->isRenderNamedFlowFragment() && region->parent() && region->parent()->isRenderNamedFlowFragmentContainer());

    RenderNamedFlowFragment* flowFragment = toRenderNamedFlowFragment(region);

52565258

5257 ClipRectsContext targetClipRectsContext(r~~egio~~n->r~~egio~~nContainerLayer(), 0, TemporaryClipRects);

5258 r~~egio~~n->r~~egio~~nContainerLayer()->calculateClipRects(targetClipRectsContext, clipRects);

5259 ClipRectsContext targetClipRectsContext(flowFragment->fragmentContainerLayer(), 0, TemporaryClipRects);

5260 flowFragment->fragmentContainerLayer()->calculateClipRects(targetClipRectsContext, clipRects);

    LayoutRect flowThreadPortionRect = region->flowThreadPortionRect();

    LayoutPoint portionLocation = flowThreadPortionRect.location();

5263 LayoutRect regionContentBox = r~~egio~~n->r~~egio~~nContainer()->contentBoxRect();

5265 LayoutRect regionContentBox = flowFragment->fragmentContainer()->contentBoxRect();

    LayoutSize moveOffset = portionLocation - regionContentBox.location();

    ClipRect newOverflowClipRect = clipRects.overflowClipRect();

@@void RenderLayer::calculateRects(const ClipRectsContext& clipRectsContext, const

        outlineRect = backgroundRect;

        // If the region does not clip its overflow, inflate the outline rect.

5459 if (!(clipRectsContext.region->parent()->hasOverflowClip() && (clipRectsContext.region->regionContainerLayer() != clipRectsContext.rootLayer || clipRectsContext.respectOverflowClip == RespectOverflowClip)))

5460 outlineRect.inflate(renderer().maximalOutlineSize(PaintPhaseOutline));

        if (clipRectsContext.region->isRenderNamedFlowFragment()) {

            if (!(clipRectsContext.region->parent()->hasOverflowClip() && (toRenderNamedFlowFragment(clipRectsContext.region)->fragmentContainerLayer() != clipRectsContext.rootLayer || clipRectsContext.respectOverflowClip == RespectOverflowClip)))

                outlineRect.inflate(renderer().maximalOutlineSize(PaintPhaseOutline));

        }

    }

    // Update the clip rects that will be passed to child layers.

Source/WebCore/rendering/RenderNamedFlowFragment.cpp

@@LayoutUnit RenderNamedFlowFragment::maxPageLogicalHeight() const

    return styleToUse.logicalMaxHeight().isUndefined() ? RenderFlowThread::maxLogicalHeight() : toRenderBlock(parent())->computeReplacedLogicalHeightUsing(styleToUse.logicalMaxHeight());

}

RenderBlockFlow* RenderNamedFlowFragment::fragmentContainer() const

{

    ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());

    return toRenderBlockFlow(parent());

}

RenderLayer* RenderNamedFlowFragment::fragmentContainerLayer() const

{

    return fragmentContainer()->layer();

}

void RenderNamedFlowFragment::layoutBlock(bool relayoutChildren, LayoutUnit)

{

    StackStats::LayoutCheckPoint layoutCheckPoint;

Source/WebCore/rendering/RenderNamedFlowFragment.h

@@public:

    virtual LayoutUnit pageLogicalHeight() const;

    LayoutUnit maxPageLogicalHeight() const;

    RenderBlockFlow* fragmentContainer() const;

    RenderLayer* fragmentContainerLayer() const;

    bool isPseudoElementRegion() const { return parent() && parent()->isPseudoElement(); }

    // When the content inside the region requires the region to have a layer, the layer will be created on the region's

Source/WebCore/rendering/RenderRegion.cpp

@@LayoutPoint RenderRegion::flowThreadPortionLocation() const

    return portionLocation;

}

RenderBlockFlow* RenderRegion::regionContainer() const

{

    ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());

    return toRenderBlockFlow(parent());

}

RenderLayer* RenderRegion::regionContainerLayer() const

{

    return regionContainer()->layer();

}

LayoutRect RenderRegion::overflowRectForFlowThreadPortion(const LayoutRect& flowThreadPortionRect, bool isFirstPortion, bool isLastPortion, OverflowType overflowType)

{

    ASSERT(isValid());

Source/WebCore/rendering/RenderRegion.h

@@public:

    LayoutRect flowThreadPortionOverflowRect();

    LayoutPoint flowThreadPortionLocation() const;

    
    RenderBlockFlow* regionContainer() const;

    RenderLayer* regionContainerLayer() const;

    virtual void attachRegion();

    virtual void detachRegion();