Changeset 127684 in webkit


Ignore:
Timestamp:
Sep 5, 2012 8:20:45 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r127596.
​http://trac.webkit.org/changeset/127596
​https://bugs.webkit.org/show_bug.cgi?id=95928

newly added tests are failing (Requested by bashi1 on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-09-05

Source/WebCore:

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::computePositionedLogicalWidth):

  • rendering/RenderRegion.cpp:
  • rendering/RenderRegion.h:

(RenderRegion):

LayoutTests:

  • fast/regions/autowidth-abspos-expected.html: Removed.
  • fast/regions/autowidth-abspos-regionchain-expected.html: Removed.
  • fast/regions/autowidth-abspos-regionchain.html: Removed.
  • fast/regions/autowidth-abspos.html: Removed.
  • fast/regions/autowidth-float-expected.html: Removed.
  • fast/regions/autowidth-float.html: Removed.
  • fast/regions/autowidth-inlineblock-expected.html: Removed.
  • fast/regions/autowidth-inlineblock.html: Removed.
  • fast/regions/autowidth-nonreplaced-abspos-expected.html: Removed.
  • fast/regions/autowidth-nonreplaced-abspos.html: Removed.
  • fast/regions/autowidth-nonreplacedblock-normalflow-expected.html: Removed.
  • fast/regions/autowidth-nonreplacedblock-normalflow.html: Removed.
  • fast/regions/autowidth-normalflow-expected.html: Removed.
  • fast/regions/autowidth-normalflow-maxwidth-expected.html: Removed.
  • fast/regions/autowidth-normalflow-maxwidth.html: Removed.
  • fast/regions/autowidth-normalflow-minmaxwidth-expected.html: Removed.
  • fast/regions/autowidth-normalflow-minmaxwidth.html: Removed.
  • fast/regions/autowidth-normalflow-minwidth-expected.html: Removed.
  • fast/regions/autowidth-normalflow-minwidth.html: Removed.
  • fast/regions/autowidth-normalflow-vertrl-expected.html: Removed.
  • fast/regions/autowidth-normalflow-vertrl.html: Removed.
  • fast/regions/autowidth-normalflow.html: Removed.
  • fast/regions/bottom-overflow-out-of-first-region.html:
  • fast/regions/flows-dependency-dynamic-remove.html:
  • fast/regions/flows-dependency-same-flow.html:
  • fast/regions/render-region-renderer-expected.html:
  • fast/regions/top-overflow-out-of-second-region.html:
Location:
trunk
Files:
22 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r127682 r127684  
     12012-09-05  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r127596.
     4        http://trac.webkit.org/changeset/127596
     5        https://bugs.webkit.org/show_bug.cgi?id=95928
     6
     7        newly added tests are failing (Requested by bashi1 on
     8        #webkit).
     9
     10        * fast/regions/autowidth-abspos-expected.html: Removed.
     11        * fast/regions/autowidth-abspos-regionchain-expected.html: Removed.
     12        * fast/regions/autowidth-abspos-regionchain.html: Removed.
     13        * fast/regions/autowidth-abspos.html: Removed.
     14        * fast/regions/autowidth-float-expected.html: Removed.
     15        * fast/regions/autowidth-float.html: Removed.
     16        * fast/regions/autowidth-inlineblock-expected.html: Removed.
     17        * fast/regions/autowidth-inlineblock.html: Removed.
     18        * fast/regions/autowidth-nonreplaced-abspos-expected.html: Removed.
     19        * fast/regions/autowidth-nonreplaced-abspos.html: Removed.
     20        * fast/regions/autowidth-nonreplacedblock-normalflow-expected.html: Removed.
     21        * fast/regions/autowidth-nonreplacedblock-normalflow.html: Removed.
     22        * fast/regions/autowidth-normalflow-expected.html: Removed.
     23        * fast/regions/autowidth-normalflow-maxwidth-expected.html: Removed.
     24        * fast/regions/autowidth-normalflow-maxwidth.html: Removed.
     25        * fast/regions/autowidth-normalflow-minmaxwidth-expected.html: Removed.
     26        * fast/regions/autowidth-normalflow-minmaxwidth.html: Removed.
     27        * fast/regions/autowidth-normalflow-minwidth-expected.html: Removed.
     28        * fast/regions/autowidth-normalflow-minwidth.html: Removed.
     29        * fast/regions/autowidth-normalflow-vertrl-expected.html: Removed.
     30        * fast/regions/autowidth-normalflow-vertrl.html: Removed.
     31        * fast/regions/autowidth-normalflow.html: Removed.
     32        * fast/regions/bottom-overflow-out-of-first-region.html:
     33        * fast/regions/flows-dependency-dynamic-remove.html:
     34        * fast/regions/flows-dependency-same-flow.html:
     35        * fast/regions/render-region-renderer-expected.html:
     36        * fast/regions/top-overflow-out-of-second-region.html:
     37
    1382012-09-05  Michelangelo De Simone  <michelangelo@webkit.org>
    239

  • trunk/LayoutTests/fast/regions/bottom-overflow-out-of-first-region.html

    r127596 r127684  
    3434    }
    3535
    36     #region3 {
    37         width: 0px;
    38         height: 0px;
    39     }
    4036</style>
    4137

  • trunk/LayoutTests/fast/regions/flows-dependency-dynamic-remove.html

    r127596 r127684  
    99.regionFlowB { -webkit-flow-from: flowB; }
    1010.regionFlowC { -webkit-flow-from: flowC; }
    11 
    12 .regionFlowA, .regionFlowB, .regionFlowC { width: 0px; height: 0px; }
    1311</style>
    1412

  • trunk/LayoutTests/fast/regions/flows-dependency-same-flow.html

    r127596 r127684  
    99.regionFlowB { -webkit-flow-from: flowB; }
    1010.regionFlowC { -webkit-flow-from: flowC; }
    11 
    12 .regionFlowA, .regionFlowB, .regionFlowC { width: 0px; height: 0px; }
    1311</style>
    1412

  • trunk/LayoutTests/fast/regions/render-region-renderer-expected.html

    r127596 r127684  
    1515    .size1
    1616    {
     17        width:0.5px;
    1718        height:0.5px;
    1819    }

  • trunk/LayoutTests/fast/regions/top-overflow-out-of-second-region.html

    r127596 r127684  
    3434    }
    3535
    36     #region3 {
    37         width: 0px;
    38         height: 0px;
    39     }
    4036</style>
    4137

  • trunk/Source/WebCore/ChangeLog

    r127683 r127684  
     12012-09-05  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r127596.
     4        http://trac.webkit.org/changeset/127596
     5        https://bugs.webkit.org/show_bug.cgi?id=95928
     6
     7        newly added tests are failing (Requested by bashi1 on
     8        #webkit).
     9
     10        * rendering/RenderBox.cpp:
     11        (WebCore::RenderBox::computePositionedLogicalWidth):
     12        * rendering/RenderRegion.cpp:
     13        * rendering/RenderRegion.h:
     14        (RenderRegion):
     15
    1162012-09-05  Arnaud Renevier  <a.renevier@sisa.samsung.com>
    217

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

    r127681 r127684  
    25442544{
    25452545    if (isReplaced()) {
    2546         // FIXME: For regions with width auto, we want to compute width using the normal block sizing code.
    2547         // For now, regions are replaced elements and this code can be removed once the RenderRegion
    2548         // will inherit from RenderBlock instead of RenderReplaced.
    2549         // (see https://bugs.webkit.org/show_bug.cgi?id=74132 )
    2550         if (!isRenderRegion() || (isRenderRegion() && shouldComputeSizeAsReplaced())) {
    2551             computePositionedLogicalWidthReplaced(); // FIXME: Patch for regions when we add replaced element support.
    2552             return;
    2553         }
     2546        computePositionedLogicalWidthReplaced(); // FIXME: Patch for regions when we add replaced element support.
     2547        return;
    25542548    }
    25552549

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

    r127596 r127684  
    497497}
    498498
    499 // FIXME: when RenderRegion will inherit from RenderBlock instead of RenderReplaced,
    500 // we should overwrite computePreferredLogicalWidths ( see https://bugs.webkit.org/show_bug.cgi?id=74132 )
    501 LayoutUnit RenderRegion::minPreferredLogicalWidth() const
    502 {
    503     if (!m_flowThread)
    504         return RenderReplaced::minPreferredLogicalWidth();
    505 
    506     // FIXME: Currently, the code handles only the <length> case for min-width. It should also support other values, like percentage, calc
    507     // or viewport relative.
    508     RenderStyle* styleToUse = style();
    509     LayoutUnit minPreferredLogicalWidth = m_flowThread->minPreferredLogicalWidth();
    510 
    511     if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0)
    512         minPreferredLogicalWidth = std::max(minPreferredLogicalWidth, computeContentBoxLogicalWidth(styleToUse->logicalMinWidth().value()));
    513 
    514     if (styleToUse->logicalMaxWidth().isFixed())
    515         minPreferredLogicalWidth = std::min(minPreferredLogicalWidth, computeContentBoxLogicalWidth(styleToUse->logicalMaxWidth().value()));
    516 
    517     return minPreferredLogicalWidth + borderAndPaddingLogicalWidth();
    518 }
    519 
    520 LayoutUnit RenderRegion::maxPreferredLogicalWidth() const
    521 {
    522     if (!m_flowThread)
    523         return RenderReplaced::maxPreferredLogicalWidth();
    524 
    525     // FIXME: Currently, the code handles only the <length> case for max-width. It should also support other values, like percentage, calc
    526     // or viewport relative.
    527     RenderStyle* styleToUse = style();
    528     LayoutUnit maxPreferredLogicalWidth = m_flowThread->maxPreferredLogicalWidth();
    529 
    530     if (styleToUse->logicalMinWidth().isFixed() && styleToUse->logicalMinWidth().value() > 0)
    531         maxPreferredLogicalWidth = std::max(maxPreferredLogicalWidth, computeContentBoxLogicalWidth(styleToUse->logicalMinWidth().value()));
    532 
    533     if (styleToUse->logicalMaxWidth().isFixed())
    534         maxPreferredLogicalWidth = std::min(maxPreferredLogicalWidth, computeContentBoxLogicalWidth(styleToUse->logicalMaxWidth().value()));
    535 
    536     return maxPreferredLogicalWidth + borderAndPaddingLogicalWidth();
    537 }
    538 
    539499} // namespace WebCore

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

    r127596 r127684  
    101101    virtual LayoutUnit pageLogicalWidth() const;
    102102    virtual LayoutUnit pageLogicalHeight() const;
    103 
    104     virtual LayoutUnit minPreferredLogicalWidth() const OVERRIDE;
    105     virtual LayoutUnit maxPreferredLogicalWidth() const OVERRIDE;
    106103   
    107104    // This method represents the logical height of the entire flow thread portion used by the region or set.
    … …  
    132129private:
    133130    virtual const char* renderName() const { return "RenderRegion"; }
    134 
    135     // FIXME: these functions should be revisited once RenderRegion inherits from RenderBlock
    136     // instead of RenderReplaced (see https://bugs.webkit.org/show_bug.cgi?id=74132 )
    137     // When width is auto, use normal block/box sizing code except when inline.
    138     virtual bool isInlineBlockOrInlineTable() const OVERRIDE { return isInline() && style()->logicalWidth().isAuto(); }
    139     virtual bool shouldComputeSizeAsReplaced() const OVERRIDE { return !style()->logicalWidth().isAuto(); }
    140131
    141132    virtual void insertedIntoTree() OVERRIDE;
Note: See TracChangeset for help on using the changeset viewer.