Changeset 124771 in webkit


Ignore:
Timestamp:
Aug 6, 2012 8:21:53 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Regions] Rename regionOverflow to regionOverset
​https://bugs.webkit.org/show_bug.cgi?id=93256

Patch by Andrei Bucur <​abucur@adobe.com> on 2012-08-06
Reviewed by Andreas Kling.

Source/WebCore:

Link to spec: ​http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-region-regionoverset
The regionOverflow property has been renamed to regionOverset in the latest working draft. This patch applies the change both externally and
internally in the code.

Tests: No new tests because this is not a functional change.

  • dom/Element.cpp:

(WebCore::Element::renderRegion): Convenience method to access the renderer for a region element.
(WebCore):
(WebCore::Element::webkitRegionOverset):

  • dom/Element.h:

(WebCore):

  • dom/Element.idl:
  • rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::paintIntoRegion):
(WebCore::RenderFlowThread::hitTestRegion):
(WebCore::RenderFlowThread::repaintRectangleInRegions):
(WebCore::RenderFlowThread::computeOverflowStateForRegions):

  • rendering/RenderRegion.cpp:

(WebCore::RenderRegion::regionOversetRect):

  • rendering/RenderRegion.h:

(RenderRegion):

LayoutTests:

Link to spec: ​http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-region-regionoverset

The tests have been adapted to use webkitRegionOverset rather than webkitRegionOverflow.

  • fast/regions/element-region-overflow-state-expected.txt: Removed.
  • fast/regions/element-region-overflow-state-vertical-rl-expected.txt: Removed.
  • fast/regions/element-region-overset-state-expected.txt: Added.
  • fast/regions/element-region-overset-state-vertical-rl-expected.txt: Added.
  • fast/regions/element-region-overset-state-vertical-rl.html: Renamed from LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html.
  • fast/regions/element-region-overset-state.html: Renamed from LayoutTests/fast/regions/element-region-overflow-state.html.
  • fast/regions/webkit-named-flow-first-empty-region-index.html:
Location:
trunk
Files:
2 added
2 deleted
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r124767 r124771  
     12012-08-06  Andrei Bucur  <abucur@adobe.com>
     2
     3        [CSS Regions] Rename regionOverflow to regionOverset
     4        https://bugs.webkit.org/show_bug.cgi?id=93256
     5
     6        Reviewed by Andreas Kling.
     7
     8        Link to spec: http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-region-regionoverset
     9
     10        The tests have been adapted to use webkitRegionOverset rather than webkitRegionOverflow.
     11
     12        * fast/regions/element-region-overflow-state-expected.txt: Removed.
     13        * fast/regions/element-region-overflow-state-vertical-rl-expected.txt: Removed.
     14        * fast/regions/element-region-overset-state-expected.txt: Added.
     15        * fast/regions/element-region-overset-state-vertical-rl-expected.txt: Added.
     16        * fast/regions/element-region-overset-state-vertical-rl.html: Renamed from LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html.
     17        * fast/regions/element-region-overset-state.html: Renamed from LayoutTests/fast/regions/element-region-overflow-state.html.
     18        * fast/regions/webkit-named-flow-first-empty-region-index.html:
     19
    1202012-08-06  Takashi Toyoshima  <toyoshim@chromium.org>
    221

  • trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl.html

    r124770 r124771  
    4444
    4545<script>
    46     description("Tests Element.webkitRegionOverflow attribute")
     46    description("Tests Element.webkitRegionOverset attribute")
    4747    if (window.testRunner) {
    4848        testRunner.dumpAsText();
    4949    }
    50     function regionOverflow(id) {
     50    function regionOverset(id) {
    5151        var e = document.getElementById(id);
    52         return e.webkitRegionOverflow;
     52        return e.webkitRegionOverset;
    5353    }
    5454    function flowContent(flowName) {
    … …  
    6868        c.style.width = 596;
    6969    }
     70
    7071    function test() {
    71         shouldBeEqualToString("regionOverflow('article')", "undefined");
    72 
    73         shouldBeEqualToString("regionOverflow('region_1')", "empty");
    74         shouldBeEqualToString("regionOverflow('region_2')", "empty");
    75         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     72        shouldBeEqualToString("regionOverset('region_1')", "empty");
     73        shouldBeEqualToString("regionOverset('region_2')", "empty");
     74        shouldBeEqualToString("regionOverset('region_3')", "empty");
    7675
    7776        debug("Flow content");
    7877        flowContent("article");
    7978
    80         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    81         shouldBeEqualToString("regionOverflow('region_2')", "fit");
    82         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     79        shouldBeEqualToString("regionOverset('region_1')", "overset");
     80        shouldBeEqualToString("regionOverset('region_2')", "fit");
     81        shouldBeEqualToString("regionOverset('region_3')", "empty");
    8382
    8483        debug("Add more content");
    8584        addMoreContent();
    8685
    87         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    88         shouldBeEqualToString("regionOverflow('region_2')", "overflow");
    89         shouldBeEqualToString("regionOverflow('region_3')", "fit");
     86        shouldBeEqualToString("regionOverset('region_1')", "overset");
     87        shouldBeEqualToString("regionOverset('region_2')", "overset");
     88        shouldBeEqualToString("regionOverset('region_3')", "fit");
    9089
    9190        debug("Add visual overflow");
    9291        addVisualOverflow();
    9392
    94         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    95         shouldBeEqualToString("regionOverflow('region_2')", "overflow");
    96         shouldBeEqualToString("regionOverflow('region_3')", "overflow");
     93        shouldBeEqualToString("regionOverset('region_1')", "overset");
     94        shouldBeEqualToString("regionOverset('region_2')", "overset");
     95        shouldBeEqualToString("regionOverset('region_3')", "overset");
    9796
    9897        debug("Empty content");
    9998        flowContent("no_article");
    10099
    101         shouldBeEqualToString("regionOverflow('region_1')", "empty");
    102         shouldBeEqualToString("regionOverflow('region_2')", "empty");
    103         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     100        shouldBeEqualToString("regionOverset('region_1')", "empty");
     101        shouldBeEqualToString("regionOverset('region_2')", "empty");
     102        shouldBeEqualToString("regionOverset('region_3')", "empty");
    104103    }
    105104

  • trunk/LayoutTests/fast/regions/element-region-overset-state.html

    r124770 r124771  
    3737
    3838<script>
    39     description("Tests Element.webkitRegionOverflow attribute")
     39    description("Tests Element.webkitRegionOverset attribute")
    4040    if (window.testRunner) {
    4141        testRunner.dumpAsText();
    4242    }
    43     function regionOverflow(id) {
     43    function regionOverset(id) {
    4444        var e = document.getElementById(id);
    45         return e.webkitRegionOverflow;
     45        return e.webkitRegionOverset;
    4646    }
    4747    function flowContent(flowName) {
    … …  
    6161        c.style.height = 326;
    6262    }
     63
    6364    function test() {
    64         shouldBeEqualToString("regionOverflow('article')", "undefined");
    65 
    66         shouldBeEqualToString("regionOverflow('region_1')", "empty");
    67         shouldBeEqualToString("regionOverflow('region_2')", "empty");
    68         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     65        shouldBeEqualToString("regionOverset('region_1')", "empty");
     66        shouldBeEqualToString("regionOverset('region_2')", "empty");
     67        shouldBeEqualToString("regionOverset('region_3')", "empty");
    6968
    7069        debug("Flow content");
    7170        flowContent("article");
    7271
    73         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    74         shouldBeEqualToString("regionOverflow('region_2')", "fit");
    75         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     72        shouldBeEqualToString("regionOverset('region_1')", "overset");
     73        shouldBeEqualToString("regionOverset('region_2')", "fit");
     74        shouldBeEqualToString("regionOverset('region_3')", "empty");
    7675
    7776        debug("Add more content");
    7877        addMoreContent();
    7978
    80         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    81         shouldBeEqualToString("regionOverflow('region_2')", "overflow");
    82         shouldBeEqualToString("regionOverflow('region_3')", "fit");
     79        shouldBeEqualToString("regionOverset('region_1')", "overset");
     80        shouldBeEqualToString("regionOverset('region_2')", "overset");
     81        shouldBeEqualToString("regionOverset('region_3')", "fit");
    8382
    8483        debug("Add visual overflow");
    8584        addVisualOverflow();
    8685
    87         shouldBeEqualToString("regionOverflow('region_1')", "overflow");
    88         shouldBeEqualToString("regionOverflow('region_2')", "overflow");
    89         shouldBeEqualToString("regionOverflow('region_3')", "overflow");
     86        shouldBeEqualToString("regionOverset('region_1')", "overset");
     87        shouldBeEqualToString("regionOverset('region_2')", "overset");
     88        shouldBeEqualToString("regionOverset('region_3')", "overset");
    9089
    9190        debug("Empty content");
    9291        flowContent("no_article");
    9392
    94         shouldBeEqualToString("regionOverflow('region_1')", "empty");
    95         shouldBeEqualToString("regionOverflow('region_2')", "empty");
    96         shouldBeEqualToString("regionOverflow('region_3')", "empty");
     93        shouldBeEqualToString("regionOverset('region_1')", "empty");
     94        shouldBeEqualToString("regionOverset('region_2')", "empty");
     95        shouldBeEqualToString("regionOverset('region_3')", "empty");
    9796    }
    9897    test();

  • trunk/LayoutTests/fast/regions/webkit-named-flow-first-empty-region-index.html

    r124410 r124771  
    4646
    4747    // Add content until some is flowed inside second region
    48     while (region2.webkitRegionOverflow == "empty") {
     48    while (region2.webkitRegionOverset == "empty") {
    4949        var p = document.createElement("p");
    5050        p.appendChild(document.createTextNode("Content inside article"));

  • trunk/Source/WebCore/ChangeLog

    r124769 r124771  
     12012-08-06  Andrei Bucur  <abucur@adobe.com>
     2
     3        [CSS Regions] Rename regionOverflow to regionOverset
     4        https://bugs.webkit.org/show_bug.cgi?id=93256
     5
     6        Reviewed by Andreas Kling.
     7
     8        Link to spec: http://www.w3.org/TR/2012/WD-css3-regions-20120503/#dom-region-regionoverset
     9        The regionOverflow property has been renamed to regionOverset in the latest working draft. This patch applies the change both externally and
     10        internally in the code.
     11
     12        Tests: No new tests because this is not a functional change.
     13
     14        * dom/Element.cpp:
     15        (WebCore::Element::renderRegion): Convenience method to access the renderer for a region element.
     16        (WebCore):
     17        (WebCore::Element::webkitRegionOverset):
     18        * dom/Element.h:
     19        (WebCore):
     20        * dom/Element.idl:
     21        * rendering/RenderFlowThread.cpp:
     22        (WebCore::RenderFlowThread::paintIntoRegion):
     23        (WebCore::RenderFlowThread::hitTestRegion):
     24        (WebCore::RenderFlowThread::repaintRectangleInRegions):
     25        (WebCore::RenderFlowThread::computeOverflowStateForRegions):
     26        * rendering/RenderRegion.cpp:
     27        (WebCore::RenderRegion::regionOversetRect):
     28        * rendering/RenderRegion.h:
     29        (RenderRegion):
     30
    1312012-08-06  Sergey Rogulenko  <rogulenko@google.com>
    232

  • trunk/Source/WebCore/dom/Element.cpp

    r124535 r124771  
    19901990}
    19911991
    1992 const AtomicString& Element::webkitRegionOverflow() const
     1992RenderRegion* Element::renderRegion() const
     1993{
     1994    if (renderer() && renderer()->isRenderRegion())
     1995        return toRenderRegion(renderer());
     1996
     1997    return 0;
     1998}
     1999
     2000const AtomicString& Element::webkitRegionOverset() const
    19932001{
    19942002    document()->updateLayoutIgnorePendingStylesheets();
    19952003
    1996     if (document()->cssRegionsEnabled() && renderer() && renderer()->isRenderRegion()) {
    1997         RenderRegion* region = toRenderRegion(renderer());
    1998         switch (region->regionState()) {
    1999         case RenderRegion::RegionFit: {
    2000             DEFINE_STATIC_LOCAL(AtomicString, fitState, ("fit"));
    2001             return fitState;
    2002         }
    2003         case RenderRegion::RegionEmpty: {
    2004             DEFINE_STATIC_LOCAL(AtomicString, emptyState, ("empty"));
    2005             return emptyState;
    2006         }
    2007         case RenderRegion::RegionOverflow: {
    2008             DEFINE_STATIC_LOCAL(AtomicString, overflowState, ("overflow"));
    2009             return overflowState;
    2010         }
    2011         default:
    2012             break;
    2013         }
    2014     }
    20152004    DEFINE_STATIC_LOCAL(AtomicString, undefinedState, ("undefined"));
     2005    if (!document()->cssRegionsEnabled() || !renderRegion())
     2006        return undefinedState;
     2007
     2008    switch (renderRegion()->regionState()) {
     2009    case RenderRegion::RegionFit: {
     2010        DEFINE_STATIC_LOCAL(AtomicString, fitState, ("fit"));
     2011        return fitState;
     2012    }
     2013    case RenderRegion::RegionEmpty: {
     2014        DEFINE_STATIC_LOCAL(AtomicString, emptyState, ("empty"));
     2015        return emptyState;
     2016    }
     2017    case RenderRegion::RegionOverset: {
     2018        DEFINE_STATIC_LOCAL(AtomicString, overflowState, ("overset"));
     2019        return overflowState;
     2020    }
     2021    case RenderRegion::RegionUndefined:
     2022        return undefinedState;
     2023    }
     2024
     2025    ASSERT_NOT_REACHED();
    20162026    return undefinedState;
    20172027}

  • trunk/Source/WebCore/dom/Element.h

    r124736 r124771  
    4141class DOMTokenList;
    4242class ElementRareData;
     43class ElementShadow;
    4344class IntSize;
     45class RenderRegion;
    4446class ShadowRoot;
    45 class ElementShadow;
    4647class WebKitAnimationList;
    4748
    … …  
    427428    PassRefPtr<RenderStyle> styleForRenderer();
    428429
    429     const AtomicString& webkitRegionOverflow() const;
     430    RenderRegion* renderRegion() const;
     431    const AtomicString& webkitRegionOverset() const;
    430432
    431433    bool hasID() const;

  • trunk/Source/WebCore/dom/Element.idl

    r124499 r124771  
    143143
    144144        // CSS Regions API
    145         readonly attribute DOMString webkitRegionOverflow;
     145        readonly attribute DOMString webkitRegionOverset;
    146146
    147147#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT

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

    r124745 r124771  
    262262    // adjusted with the region padding and border.
    263263    LayoutRect regionRect(region->regionRect());
    264     LayoutRect regionOverflowRect(region->regionOverflowRect());
    265     LayoutRect regionClippingRect(paintOffset + (regionOverflowRect.location() - regionRect.location()), regionOverflowRect.size());
     264    LayoutRect regionOversetRect(region->regionOversetRect());
     265    LayoutRect regionClippingRect(paintOffset + (regionOversetRect.location() - regionRect.location()), regionOversetRect.size());
    266266
    267267    PaintInfo info(paintInfo);
    … …  
    296296{
    297297    LayoutRect regionRect(region->regionRect());
    298     LayoutRect regionOverflowRect = region->regionOverflowRect();
    299     LayoutRect regionClippingRect(accumulatedOffset + (regionOverflowRect.location() - regionRect.location()), regionOverflowRect.size());
     298    LayoutRect regionOversetRect = region->regionOversetRect();
     299    LayoutRect regionClippingRect(accumulatedOffset + (regionOversetRect.location() - regionRect.location()), regionOversetRect.size());
    300300    if (!regionClippingRect.contains(pointInContainer.point()))
    301301        return false;
    … …  
    343343        // We only have to issue a repaint in this region if the region rect intersects the repaint rect.
    344344        LayoutRect flippedRegionRect(region->regionRect());
    345         LayoutRect flippedRegionOverflowRect(region->regionOverflowRect());
     345        LayoutRect flippedRegionOversetRect(region->regionOversetRect());
    346346        flipForWritingMode(flippedRegionRect); // Put the region rects into physical coordinates.
    347         flipForWritingMode(flippedRegionOverflowRect);
     347        flipForWritingMode(flippedRegionOversetRect);
    348348
    349349        LayoutRect clippedRect(repaintRect);
    350         clippedRect.intersect(flippedRegionOverflowRect);
     350        clippedRect.intersect(flippedRegionOversetRect);
    351351        if (clippedRect.isEmpty())
    352352            continue;
    … …  
    695695            state = RenderRegion::RegionEmpty;
    696696        if (flowMax > 0)
    697             state = RenderRegion::RegionOverflow;
     697            state = RenderRegion::RegionOverset;
    698698        region->setRegionState(state);
    699699        // determine whether the NamedFlow object should dispatch a regionLayoutUpdate event
    700         // FIXME: currently it cannot determine whether a region whose regionOverflow state remained either "fit" or "overflow" has actually
     700        // FIXME: currently it cannot determine whether a region whose regionOverset state remained either "fit" or "overset" has actually
    701701        // changed, so it just assumes that the NamedFlow should dispatch the event
    702702        if (previousState != state
    703703            || state == RenderRegion::RegionFit
    704             || state == RenderRegion::RegionOverflow)
     704            || state == RenderRegion::RegionOverset)
    705705            setDispatchRegionLayoutUpdateEvent(true);
    706706    }
    … …  
    709709    // If there are no valid regions in the chain, overset is true
    710710    RenderRegion* lastReg = lastRegion();
    711     m_overset = lastReg ? lastReg->regionState() == RenderRegion::RegionOverflow : true;
     711    m_overset = lastReg ? lastReg->regionState() == RenderRegion::RegionOverset : true;
    712712}
    713713

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

    r124425 r124771  
    6363}
    6464
    65 LayoutRect RenderRegion::regionOverflowRect() const
     65LayoutRect RenderRegion::regionOversetRect() const
    6666{
    6767    // FIXME: Would like to just use hasOverflowClip() but we aren't a block yet. When RenderRegion is eliminated and

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

    r124350 r124771  
    5353    void setRegionRect(const LayoutRect& rect) { m_regionRect = rect; }
    5454    LayoutRect regionRect() const { return m_regionRect; }
    55     LayoutRect regionOverflowRect() const;
     55    LayoutRect regionOversetRect() const;
    5656
    5757    void attachRegion();
    … …  
    8989        RegionEmpty,
    9090        RegionFit,
    91         RegionOverflow
     91        RegionOverset
    9292    };
    9393
Note: See TracChangeset for help on using the changeset viewer.