⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 285745 in webkit


Ignore:
Timestamp:
Nov 12, 2021, 3:00:38 PM (5 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r285583.

Seems to have caused many layout tests to become flaky
failures

Reverted changeset:

"[css-contain] Support contain:paint"
​https://bugs.webkit.org/show_bug.cgi?id=224742
​https://commits.webkit.org/r285583

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r285743 r285745  
     12021-11-12  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r285583.
     4
     5        Seems to have caused many layout tests to become flaky
     6        failures
     7
     8        Reverted changeset:
     9
     10        "[css-contain] Support contain:paint"
     11        https://bugs.webkit.org/show_bug.cgi?id=224742
     12        https://commits.webkit.org/r285583
     13
    1142021-11-12  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/LayoutTests/TestExpectations

    r285709 r285745  
    47224722# webkit-ruby-text
    47234723imported/w3c/web-platform-tests/css/css-contain/contain-layout-017.html [ ImageOnlyFailure ]
    4724 imported/w3c/web-platform-tests/css/css-contain/contain-paint-005.html [ ImageOnlyFailure ]
    4725 imported/w3c/web-platform-tests/css/css-contain/contain-paint-006.html [ ImageOnlyFailure ]
    4726 imported/w3c/web-platform-tests/css/css-contain/contain-paint-008.html [ ImageOnlyFailure ]
    4727 imported/w3c/web-platform-tests/css/css-contain/contain-paint-021.html [ ImageOnlyFailure ]
    47284724imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-001.html [ ImageOnlyFailure ]
    47294725imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-003.html [ ImageOnlyFailure ]
    … …  
    47404736imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-021.html [ ImageOnlyFailure ]
    47414737imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-022.html [ ImageOnlyFailure ]
     4738imported/w3c/web-platform-tests/css/css-contain/contain-paint-001.html [ ImageOnlyFailure ]
     4739imported/w3c/web-platform-tests/css/css-contain/contain-paint-004.html [ ImageOnlyFailure ]
     4740imported/w3c/web-platform-tests/css/css-contain/contain-paint-005.html [ ImageOnlyFailure ]
     4741imported/w3c/web-platform-tests/css/css-contain/contain-paint-006.html [ ImageOnlyFailure ]
     4742imported/w3c/web-platform-tests/css/css-contain/contain-paint-008.html [ ImageOnlyFailure ]
     4743imported/w3c/web-platform-tests/css/css-contain/contain-paint-009.html [ ImageOnlyFailure ]
     4744imported/w3c/web-platform-tests/css/css-contain/contain-paint-010.html [ ImageOnlyFailure ]
     4745imported/w3c/web-platform-tests/css/css-contain/contain-paint-014.html [ ImageOnlyFailure ]
     4746imported/w3c/web-platform-tests/css/css-contain/contain-paint-019.html [ ImageOnlyFailure ]
     4747imported/w3c/web-platform-tests/css/css-contain/contain-paint-020.html [ ImageOnlyFailure ]
     4748imported/w3c/web-platform-tests/css/css-contain/contain-paint-022.html [ ImageOnlyFailure ]
     4749imported/w3c/web-platform-tests/css/css-contain/contain-paint-023.html [ ImageOnlyFailure ]
     4750imported/w3c/web-platform-tests/css/css-contain/contain-paint-047.html [ ImageOnlyFailure ]
     4751imported/w3c/web-platform-tests/css/css-contain/contain-paint-048.html [ ImageOnlyFailure ]
     4752imported/w3c/web-platform-tests/css/css-contain/contain-paint-cell-001.html [ ImageOnlyFailure ]
     4753imported/w3c/web-platform-tests/css/css-contain/contain-paint-cell-002.html [ ImageOnlyFailure ]
     4754imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-001.html [ ImageOnlyFailure ]
     4755imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-002.html [ ImageOnlyFailure ]
     4756imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-006.html [ ImageOnlyFailure ]
     4757imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-011.html [ ImageOnlyFailure ]
     4758imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-012.html [ ImageOnlyFailure ]
     4759imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-013.html [ ImageOnlyFailure ]
     4760imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-014.html [ ImageOnlyFailure ]
    47424761imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-015.html [ ImageOnlyFailure ]
    47434762imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-016.html [ ImageOnlyFailure ]
     4763imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-017.html [ ImageOnlyFailure ]
     4764imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-018.html [ ImageOnlyFailure ]
     4765imported/w3c/web-platform-tests/css/css-contain/contain-paint-clip-019.html [ ImageOnlyFailure ]
     4766imported/w3c/web-platform-tests/css/css-contain/contain-paint-containing-block-absolute-001.html [ ImageOnlyFailure ]
     4767imported/w3c/web-platform-tests/css/css-contain/contain-paint-containing-block-fixed-001.html [ ImageOnlyFailure ]
     4768imported/w3c/web-platform-tests/css/css-contain/contain-paint-formatting-context-float-001.html [ ImageOnlyFailure ]
     4769imported/w3c/web-platform-tests/css/css-contain/contain-paint-formatting-context-margin-001.html [ ImageOnlyFailure ]
     4770imported/w3c/web-platform-tests/css/css-contain/contain-paint-ifc-011.html [ ImageOnlyFailure ]
     4771imported/w3c/web-platform-tests/css/css-contain/contain-paint-independent-formatting-context-001.html [ ImageOnlyFailure ]
     4772imported/w3c/web-platform-tests/css/css-contain/contain-paint-size-001.html [ ImageOnlyFailure ]
     4773imported/w3c/web-platform-tests/css/css-contain/contain-paint-size-002.html [ ImageOnlyFailure ]
     4774imported/w3c/web-platform-tests/css/css-contain/contain-paint-size-003.html [ ImageOnlyFailure ]
     4775imported/w3c/web-platform-tests/css/css-contain/contain-paint-stacking-context-001a.html [ ImageOnlyFailure ]
     4776imported/w3c/web-platform-tests/css/css-contain/contain-paint-table-001.html [ ImageOnlyFailure ]
     4777imported/w3c/web-platform-tests/css/css-contain/contain-paint-table-002.html [ ImageOnlyFailure ]
     4778imported/w3c/web-platform-tests/css/css-contain/contain-strict-001.html [ ImageOnlyFailure ]
     4779imported/w3c/web-platform-tests/css/css-contain/contain-strict-002.html [ ImageOnlyFailure ]
     4780imported/w3c/web-platform-tests/css/css-contain/contain-strict-011.html [ ImageOnlyFailure ]
    47444781imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-032.html [ ImageOnlyFailure ]
    47454782imported/w3c/web-platform-tests/css/css-contain/content-visibility/content-visibility-033.sub.https.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r285740 r285745  
     12021-11-12  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r285583.
     4
     5        Seems to have caused many layout tests to become flaky
     6        failures
     7
     8        Reverted changeset:
     9
     10        "[css-contain] Support contain:paint"
     11        https://bugs.webkit.org/show_bug.cgi?id=224742
     12        https://commits.webkit.org/r285583
     13
    1142021-11-12  Alexey Shvayka  <ashvayka@apple.com>
    215

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/flex-item-contains-strict-expected.txt

    r285583 r285745  
    11Stretched:
    22
     3Column
    34
     5Row
    46
    57Column
    … …  
    810Flex-start:
    911
     12Column
    1013
     14Row
    1115
    1216Column

  • trunk/Source/WebCore/ChangeLog

    r285740 r285745  
     12021-11-12  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r285583.
     4
     5        Seems to have caused many layout tests to become flaky
     6        failures
     7
     8        Reverted changeset:
     9
     10        "[css-contain] Support contain:paint"
     11        https://bugs.webkit.org/show_bug.cgi?id=224742
     12        https://commits.webkit.org/r285583
     13
    1142021-11-12  Alexey Shvayka  <ashvayka@apple.com>
    215

  • trunk/Source/WebCore/page/FrameView.cpp

    r285640 r285745  
    645645    bool overrideHidden = frame().isMainFrame() && ((frame().frameScaleFactor() > 1) || headerHeight() || footerHeight());
    646646
    647     Overflow overflowX = renderer.effectiveOverflowX();
    648     Overflow overflowY = renderer.effectiveOverflowY();
     647    Overflow overflowX = renderer.style().overflowX();
     648    Overflow overflowY = renderer.style().overflowY();
    649649
    650650    if (is<RenderSVGRoot>(renderer)) {
    … …  
    710710    auto* body = document->body();
    711711    if (body && body->renderer()) {
    712         documentOrBodyRenderer = documentRenderer.effectiveOverflowX() == Overflow::Visible && is<HTMLHtmlElement>(*documentElement) ?
     712        documentOrBodyRenderer = documentRenderer.style().overflowX() == Overflow::Visible && is<HTMLHtmlElement>(*documentElement) ?
    713713            body->renderer() : &documentRenderer;
    714714    }
    715715
    716716    Pagination pagination;
    717     Overflow overflowY = documentOrBodyRenderer->effectiveOverflowY();
     717    Overflow overflowY = documentOrBodyRenderer->style().overflowY();
    718718    if (overflowY == Overflow::PagedX || overflowY == Overflow::PagedY) {
    719719        pagination.mode = WebCore::paginationModeForRenderStyle(documentOrBodyRenderer->style());
    … …  
    777777        // It's sufficient to just check the X overflow,
    778778        // since it's illegal to have visible in only one direction.
    779         if (rootRenderer->effectiveOverflowX() == Overflow::Visible && is<HTMLHtmlElement>(documentElement)) {
     779        if (rootRenderer->style().overflowX() == Overflow::Visible && is<HTMLHtmlElement>(documentElement)) {
    780780            auto* bodyRenderer = bodyOrFrameset->renderer();
    781781            if (bodyRenderer) {

  • trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp

    r285583 r285745  
    847847
    848848    const Length& childMinSize = isRowAxis ? child.style().logicalMinWidth() : child.style().logicalMinHeight();
    849     bool overflowIsVisible = isRowAxis ? child.effectiveOverflowInlineDirection() == Overflow::Visible : child.effectiveOverflowBlockDirection() == Overflow::Visible;
     849    bool overflowIsVisible = isRowAxis ? child.style().overflowInlineDirection() == Overflow::Visible : child.style().overflowBlockDirection() == Overflow::Visible;
    850850    LayoutUnit baselineShim = m_algorithm.baselineOffsetForChild(child, gridAxisForDirection(direction()));
    851851

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r285709 r285745  
    488488
    489489    // We also handle <body> and <html>, whose overflow applies to the viewport.
    490     if (!(effectiveOverflowX() == Overflow::Visible && effectiveOverflowY() == Overflow::Visible) && !isDocElementRenderer && isRenderBlock()) {
     490    if (!(styleToUse.overflowX() == Overflow::Visible && styleToUse.overflowY() == Overflow::Visible) && !isDocElementRenderer && isRenderBlock()) {
    491491        bool boxHasNonVisibleOverflow = true;
    492492        if (isBody()) {
    … …  
    497497            if (is<HTMLHtmlElement>(*document().documentElement())
    498498                && document().body() == element()
    499                 && document().documentElement()->renderer()->effectiveOverflowX() == Overflow::Visible) {
     499                && document().documentElement()->renderer()->style().overflowX() == Overflow::Visible) {
    500500                boxHasNonVisibleOverflow = false;
    501501            }
    … …  
    667667        return logicalWidth;
    668668    auto minLength = styleToUse.logicalMinWidth();
    669     if (styleToUse.hasAspectRatio() && minLength.isAuto() && (styleToUse.logicalWidth().isAuto() || styleToUse.logicalWidth().isMinContent() || styleToUse.logicalWidth().isMaxContent()) && effectiveOverflowInlineDirection() == Overflow::Visible) {
     669    if (styleToUse.hasAspectRatio() && minLength.isAuto() && (styleToUse.logicalWidth().isAuto() || styleToUse.logicalWidth().isMinContent() || styleToUse.logicalWidth().isMaxContent()) && styleToUse.overflowInlineDirection() == Overflow::Visible) {
    670670        // Make sure we actually used the aspect ratio.
    671671        if (shouldComputeLogicalWidthFromAspectRatio())
    … …  
    683683    }
    684684    auto logicalMinHeight = styleToUse.logicalMinHeight();
    685     if (logicalMinHeight.isAuto() && shouldComputeLogicalHeightFromAspectRatio() && intrinsicContentHeight && effectiveOverflowBlockDirection() == Overflow::Visible) {
     685    if (logicalMinHeight.isAuto() && shouldComputeLogicalHeightFromAspectRatio() && intrinsicContentHeight && styleToUse.overflowBlockDirection() == Overflow::Visible) {
    686686        auto heightFromAspectRatio = blockSizeFromAspectRatio(horizontalBorderAndPaddingExtent(), verticalBorderAndPaddingExtent(), LayoutUnit(style().logicalAspectRatio()), style().boxSizingForAspectRatio(), logicalWidth()) - borderAndPaddingLogicalHeight();
    687687        if (firstChild())
    … …  
    49074907    return isInlineBlockOrInlineTable() || isFloatingOrOutOfFlowPositioned() || hasPotentiallyScrollableOverflow() || isFlexItemIncludingDeprecated()
    49084908        || isTableCell() || isTableCaption() || isFieldset() || isWritingModeRoot() || isDocumentElementRenderer() || isRenderFragmentedFlow()
    4909         || style().containsLayout() || paintContainmentApplies() || isGridItem() || style().specifiesColumns() || style().columnSpan() == ColumnSpan::All || style().display() == DisplayType::FlowRoot;
     4909        || style().containsLayout() || isGridItem() || style().specifiesColumns() || style().columnSpan() == ColumnSpan::All || style().display() == DisplayType::FlowRoot;
    49104910}
    49114911
    … …  
    49754975void RenderBox::addOverflowFromChild(const RenderBox* child, const LayoutSize& delta)
    49764976{
    4977     if (paintContainmentApplies())
    4978         return;
    49794977    // Never allow flow threads to propagate overflow up to a parent.
    49804978    if (child->isRenderFragmentedFlow())

  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r285583 r285745  
    212212    if (styleToUse.isFlippedBlocksWritingMode())
    213213        view().frameView().setHasFlippedBlockRenderers(true);
    214     setPaintContainmentApplies(shouldApplyPaintContainment(*this));
    215214}
    216215

  • trunk/Source/WebCore/rendering/RenderElement.cpp

    r285615 r285745  
    23182318            // For fixed height styles, if the overflow size of the element spills out of the specified
    23192319            // height, assume we can apply text auto-sizing.
    2320             if (downcast<RenderBlock>(renderer).effectiveOverflowY() == Overflow::Visible
     2320            if (style.overflowY() == Overflow::Visible
    23212321                && style.height().value() < downcast<RenderBlock>(renderer).layoutOverflowRect().maxY())
    23222322                return RenderObject::OverflowHeight;
    … …  
    24082408}
    24092409
    2410 Overflow RenderElement::effectiveOverflowX() const
    2411 {
    2412     auto overflowX = style().overflowX();
    2413     if (paintContainmentApplies() && overflowX == Overflow::Visible)
    2414         return Overflow::Clip;
    2415     return overflowX;
    2416 }
    2417 
    2418 Overflow RenderElement::effectiveOverflowY() const
    2419 {
    2420     auto overflowY = style().overflowY();
    2421     if (paintContainmentApplies() && overflowY == Overflow::Visible)
    2422         return Overflow::Clip;
    2423     return overflowY;
    2424 }
    2425 
    2426 }
     2410}

  • trunk/Source/WebCore/rendering/RenderElement.h

    r285583 r285745  
    269269    ReferencedSVGResources& ensureReferencedSVGResources();
    270270
    271     Overflow effectiveOverflowX() const;
    272     Overflow effectiveOverflowY() const;
    273     Overflow effectiveOverflowInlineDirection() const { return style().isHorizontalWritingMode() ? effectiveOverflowX() : effectiveOverflowY(); }
    274     Overflow effectiveOverflowBlockDirection() const { return style().isHorizontalWritingMode() ? effectiveOverflowY() : effectiveOverflowX(); }
    275 
    276271protected:
    277272    enum BaseTypeFlag {
    … …  
    462457        || (isRenderBlock() && style().willChange() && style().willChange()->createsContainingBlockForOutOfFlowPositioned())
    463458        || isSVGForeignObject()
    464         || shouldApplyLayoutContainment(*this)
    465         || shouldApplyPaintContainment(*this);
     459        || shouldApplyLayoutContainment(*this);
    466460}
    467461
    … …  
    474468        || isSVGForeignObject()
    475469        || shouldApplyLayoutContainment(*this)
    476         || shouldApplyPaintContainment(*this)
    477470        || isRenderView();
    478471}

  • trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

    r285709 r285745  
    18451845{
    18461846    if (isHorizontalFlow())
    1847         return child.effectiveOverflowX();
    1848     return child.effectiveOverflowY();
     1847        return child.style().overflowX();
     1848    return child.style().overflowY();
    18491849}
    18501850
    … …  
    18521852{
    18531853    if (isHorizontalFlow())
    1854         return child.effectiveOverflowY();
    1855     return child.effectiveOverflowX();
     1854        return child.style().overflowY();
     1855    return child.style().overflowX();
    18561856}
    18571857

  • trunk/Source/WebCore/rendering/RenderFragmentContainer.cpp

    r285583 r285745  
    158158        LayoutUnit minY = isFirstPortion ? fragmentedFlowOverflow.y() : fragmentedFlowPortionRect.y();
    159159        LayoutUnit maxY = isLastPortion ? std::max(fragmentedFlowPortionRect.maxY(), fragmentedFlowOverflow.maxY()) : fragmentedFlowPortionRect.maxY();
    160         bool clipX = effectiveOverflowX() != Overflow::Visible;
     160        bool clipX = style().overflowX() != Overflow::Visible;
    161161        LayoutUnit minX = clipX ? fragmentedFlowPortionRect.x() : std::min(fragmentedFlowPortionRect.x(), fragmentedFlowOverflow.x());
    162162        LayoutUnit maxX = clipX ? fragmentedFlowPortionRect.maxX() : std::max(fragmentedFlowPortionRect.maxX(), fragmentedFlowOverflow.maxX());
    … …  
    165165        LayoutUnit minX = isFirstPortion ? fragmentedFlowOverflow.x() : fragmentedFlowPortionRect.x();
    166166        LayoutUnit maxX = isLastPortion ? std::max(fragmentedFlowPortionRect.maxX(), fragmentedFlowOverflow.maxX()) : fragmentedFlowPortionRect.maxX();
    167         bool clipY = effectiveOverflowY() != Overflow::Visible;
     167        bool clipY = style().overflowY() != Overflow::Visible;
    168168        LayoutUnit minY = clipY ? fragmentedFlowPortionRect.y() : std::min(fragmentedFlowPortionRect.y(), fragmentedFlowOverflow.y());
    169169        LayoutUnit maxY = clipY ? fragmentedFlowPortionRect.maxY() : std::max(fragmentedFlowPortionRect.y(), fragmentedFlowOverflow.maxY());

  • trunk/Source/WebCore/rendering/RenderInline.h

    r285583 r285745  
    8383    bool mayAffectLayout() const;
    8484
    85     bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath() || shouldApplyPaintContainment(*this) || willChangeCreatesStackingContext() || hasRunningAcceleratedAnimations(); }
     85    bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath() || willChangeCreatesStackingContext() || hasRunningAcceleratedAnimations(); }
    8686
    8787protected:

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r285618 r285745  
    557557        || renderer.hasReflection()
    558558        || renderer.style().hasIsolation()
    559         || shouldApplyPaintContainment(renderer)
    560559        || !renderer.style().hasAutoUsedZIndex()
    561560        || (renderer.style().willChange() && renderer.style().willChange()->canCreateStackingContext())
    … …  
    589588bool RenderLayer::shouldBeCSSStackingContext() const
    590589{
    591     return !renderer().style().hasAutoUsedZIndex() || shouldApplyPaintContainment(renderer()) || isRenderViewLayer();
     590    return !renderer().style().hasAutoUsedZIndex() || isRenderViewLayer();
    592591}
    593592
    … …  
    10911090{
    10921091    for (RenderLayer* layer = this; layer; layer = layer->parent()) {
    1093         if (shouldApplyPaintContainment(renderer())) {
    1094             m_hasSelfPaintingLayerDescendant = true;
    1095             m_hasSelfPaintingLayerDescendantDirty = false;
    1096             break;
    1097         }
    10981092        if (!layer->m_hasSelfPaintingLayerDescendantDirty && layer->hasSelfPaintingLayerDescendant())
    10991093            break;
    … …  
    14961490{
    14971491    for (RenderLayer* layer = this; layer; layer = layer->parent()) {
    1498         if (shouldApplyPaintContainment(renderer())) {
    1499             m_hasVisibleDescendant = true;
    1500             m_visibleDescendantStatusDirty = false;
    1501             break;
    1502         }
    15031492        if (!layer->m_visibleDescendantStatusDirty && layer->hasVisibleDescendant())
    15041493            break;
    … …  
    45414530            if (renderer().isPositioned())
    45424531                clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
    4543             if (shouldApplyPaintContainment(renderer())) {
    4544                 clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
    4545                 clipRects.setFixedClipRect(intersection(newOverflowClip, clipRects.fixedClipRect()));
    4546             }
    45474532        }
    45484533        if (renderer().hasClip()) {

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r285583 r285745  
    19201920}
    19211921
    1922 void RenderObject::setPaintContainmentApplies(bool paintContainmentApplies)
    1923 {
    1924     if (paintContainmentApplies || hasRareData())
    1925         ensureRareData().setPaintContainmentApplies(paintContainmentApplies);
    1926 }
    1927 
    19281922RenderObject::RareDataMap& RenderObject::rareDataMap()
    19291923{
    … …  
    25532547    return (!renderer.isInline() || renderer.isAtomicInlineLevelBox()) && !renderer.isRubyText() && (!renderer.isTablePart() || renderer.isTableCaption()) && !renderer.isTable();
    25542548}
    2555 
    2556 bool WebCore::shouldApplyPaintContainment(const WebCore::RenderObject& renderer)
    2557 {
    2558     return renderer.style().containsPaint() && (!renderer.isInline() || renderer.isAtomicInlineLevelBox()) && !renderer.isRubyText() && (!renderer.isTablePart() || renderer.isRenderBlockFlow());
    2559 }
    2560 

  • trunk/Source/WebCore/rendering/RenderObject.h

    r285583 r285745  
    409409    bool isRenderFragmentedFlow() const { return m_bitfields.hasRareData() && rareData().isRenderFragmentedFlow(); }
    410410    bool hasOutlineAutoAncestor() const { return m_bitfields.hasRareData() && rareData().hasOutlineAutoAncestor(); }
    411     bool paintContainmentApplies() const { return m_bitfields.hasRareData() && rareData().paintContainmentApplies(); }
    412411
    413412    bool isExcludedFromNormalLayout() const { return m_bitfields.isExcludedFromNormalLayout(); }
    … …  
    507506    void setIsRenderFragmentedFlow(bool = true);
    508507    void setHasOutlineAutoAncestor(bool = true);
    509     void setPaintContainmentApplies(bool = true);
    510508
    511509    // Hook so that RenderTextControl can return the line height of its inner renderer.
    … …  
    938936        ADD_BOOLEAN_BITFIELD(isRenderFragmentedFlow, IsRenderFragmentedFlow);
    939937        ADD_BOOLEAN_BITFIELD(hasOutlineAutoAncestor, HasOutlineAutoAncestor);
    940         ADD_BOOLEAN_BITFIELD(paintContainmentApplies, PaintContainmentApplies);
    941938
    942939        // From RenderElement
    … …  
    12131210bool shouldApplySizeContainment(const RenderObject&);
    12141211bool shouldApplyStyleContainment(const RenderObject&);
    1215 bool shouldApplyPaintContainment(const RenderObject&);
    12161212
    12171213} // namespace WebCore

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r285615 r285745  
    332332    Overflow overflowX() const { return static_cast<Overflow>(m_nonInheritedFlags.overflowX); }
    333333    Overflow overflowY() const { return static_cast<Overflow>(m_nonInheritedFlags.overflowY); }
     334    Overflow overflowInlineDirection() const { return isHorizontalWritingMode() ? overflowX() : overflowY(); }
     335    Overflow overflowBlockDirection() const { return isHorizontalWritingMode() ? overflowY() : overflowX(); }
    334336    bool isOverflowVisible() const { return overflowX() == Overflow::Visible || overflowY() == Overflow::Visible; }
    335337
    … …  
    531533    bool containsSize() const { return m_rareNonInheritedData->contain.contains(Containment::Size); }
    532534    bool containsStyle() const { return m_rareNonInheritedData->contain.contains(Containment::Style); }
    533     bool containsPaint() const { return m_rareNonInheritedData->contain.contains(Containment::Paint); }
    534535    BoxAlignment boxAlign() const { return static_cast<BoxAlignment>(m_rareNonInheritedData->deprecatedFlexibleBox->align); }
    535536    BoxDirection boxDirection() const { return static_cast<BoxDirection>(m_inheritedFlags.boxDirection); }

  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

    r285583 r285745  
    216216    // When the svg is stand-alone (isDocumentElement() == true) the viewport clipping should always
    217217    // be applied, noting that the window scrollbars should be hidden if overflow=hidden.
    218     return effectiveOverflowX() == Overflow::Hidden
     218    return style().overflowX() == Overflow::Hidden
    219219        || style().overflowX() == Overflow::Auto
    220220        || style().overflowX() == Overflow::Scroll
Note: See TracChangeset for help on using the changeset viewer.