Changeset 125271 in webkit


Ignore:
Timestamp:
Aug 10, 2012 4:46:01 AM (12 years ago)
Author:
mihnea@adobe.com
Message:

[CSS Regions] region-overflow: break still renders the content that does not fit in the last region.
​https://bugs.webkit.org/show_bug.cgi?id=92996

Reviewed by Julien Chaffraix.

Source/WebCore:

Flow content that follows the last break in the last region, if any, should not be rendered
for the regions with region-overflow: break.
​http://www.w3.org/TR/css3-regions/#the-region-overflow-property

Modified the expected result for existing test fast/regions/region-overflow-break.html
to reflect the correct behavior.

  • rendering/RenderRegion.cpp:

(WebCore::RenderRegion::regionOversetRect):

LayoutTests:

Modified expected result for original test to match the behavior described in the regions spec.

  • fast/regions/region-overflow-break-expected.html:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r125269 r125271  
     12012-08-10  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSS Regions] region-overflow: break still renders the content that does not fit in the last region.
     4        https://bugs.webkit.org/show_bug.cgi?id=92996
     5
     6        Reviewed by Julien Chaffraix.
     7
     8        Modified expected result for original test to match the behavior described in the regions spec.
     9
     10        * fast/regions/region-overflow-break-expected.html:
     11
    1122012-08-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
    213

  • trunk/LayoutTests/fast/regions/region-overflow-break-expected.html

    r113998 r125271  
    99#gray, #blue {
    1010    vertical-align:top;
    11     overflow:visible;
     11}
     12
     13#blue {
     14    overflow: hidden;
    1215}
    1316
    … …  
    3437  line-height:2;
    3538  color:#00a0e0;
    36   text-align:justify;
    37   clear:none;
    38   float:left;
    39 }
    40 
    41 #red {
    42   height:86px;
    43   width:300px;
    44   margin-top:-1px;
    45   margin-left:11px;
    46   font-size:12px;
    47   line-height:2;
    48   color:#800000;
    4939  text-align:justify;
    5040  clear:none;
    … …  
    8070</div>
    8171
    82 <div id="red">
    83   <span style="background-color:#800000">
    84     This is some content This is some content
    85     This is some content This is some content
    86     This is some content This is some content
    87     This is some content.
    88   </span>
    89 </div>

  • trunk/Source/WebCore/ChangeLog

    r125268 r125271  
     12012-08-10  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSS Regions] region-overflow: break still renders the content that does not fit in the last region.
     4        https://bugs.webkit.org/show_bug.cgi?id=92996
     5
     6        Reviewed by Julien Chaffraix.
     7
     8        Flow content that follows the last break in the last region, if any, should not be rendered
     9        for the regions with region-overflow: break.
     10        http://www.w3.org/TR/css3-regions/#the-region-overflow-property
     11
     12        Modified the expected result for existing test fast/regions/region-overflow-break.html
     13        to reflect the correct behavior.
     14
     15        * rendering/RenderRegion.cpp:
     16        (WebCore::RenderRegion::regionOversetRect):
     17
    1182012-08-10  Andrei Poenaru  <poenaru@adobe.com>
    219

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

    r125192 r125271  
    6969    bool clipX = style()->overflowX() != OVISIBLE;
    7070    bool clipY = style()->overflowY() != OVISIBLE;
    71     if ((clipX && clipY) || !isValid() || !m_flowThread)
     71    bool isLastRegionWithRegionOverflowBreak = (isLastRegion() && (style()->regionOverflow() == BreakRegionOverflow));
     72    if ((clipX && clipY) || !isValid() || !m_flowThread || isLastRegionWithRegionOverflowBreak)
    7273        return regionRect();
    7374
Note: See TracChangeset for help on using the changeset viewer.