Attachment 157219 Details for Bug 93102 – Patch

[patch] Patch

bug-93102-20120808175326.patch (text/plain), 11.99 KB, created by Andrei Onea on 2012-08-08 07:53:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrei Onea

Created: 2012-08-08 07:53:53 PDT

Size: 11.99 KB

patch

obsolete

>Subversion Revision: 124860
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ccb8fe0f86a0a8f54dd226641dfdcea0f29d219e..7e0f597e61ee593b5268a00b3e47a286cb8f2b1b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-08-08  Andrei Onea  <onea@adobe.com>
>+
>+        [CSSRegions]regionOverset is computed as "overset" even though the region is not the last in the chain
>+        https://bugs.webkit.org/show_bug.cgi?id=93102
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Making Element.webkitRegionOverset return "overset" only for the last region in a region chain, 
>+        if the content cannot fit inside it, to reflect current spec. http://www.w3.org/TR/css3-regions/#dom-region-regionoverset .
>+
>+        No new tests, modified old tests to reflect spec.
>+        * rendering/RenderFlowThread.cpp:
>+        (WebCore::RenderFlowThread::computeOverflowStateForRegions):
>+
> 2012-08-06  Arko Saha  <arko@motorola.com>
> 
>         Microdata: itemType[index] must be undefined for out-of-range index.
>diff --git a/Source/WebCore/rendering/RenderFlowThread.cpp b/Source/WebCore/rendering/RenderFlowThread.cpp
>index 1c805c02738159face40342f9c9241bfc428e489..f82c4b9df71c3af5573e76e5b6185a90d121ec00 100644
>--- a/Source/WebCore/rendering/RenderFlowThread.cpp
>+++ b/Source/WebCore/rendering/RenderFlowThread.cpp
>@@ -681,6 +681,7 @@ void RenderFlowThread::computeOverflowStateForRegions(LayoutUnit oldClientAfterE
>     if (hasRenderOverflow())
>         height = isHorizontalWritingMode() ? visualOverflowRect().maxY() : visualOverflowRect().maxX();
> 
>+    RenderRegion* lastReg = lastRegion();
>     for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
>         RenderRegion* region = *iter;
>         if (!region->isValid()) {
>@@ -693,7 +694,7 @@ void RenderFlowThread::computeOverflowStateForRegions(LayoutUnit oldClientAfterE
>         RenderRegion::RegionState state = RenderRegion::RegionFit;
>         if (flowMin <= 0)
>             state = RenderRegion::RegionEmpty;
>-        if (flowMax > 0)
>+        if (flowMax > 0 && region == lastReg)
>             state = RenderRegion::RegionOverset;
>         region->setRegionState(state);
>         // determine whether the NamedFlow object should dispatch a regionLayoutUpdate event
>@@ -707,7 +708,6 @@ void RenderFlowThread::computeOverflowStateForRegions(LayoutUnit oldClientAfterE
> 
>     // With the regions overflow state computed we can also set the overset flag for the named flow.
>     // If there are no valid regions in the chain, overset is true
>-    RenderRegion* lastReg = lastRegion();
>     m_overset = lastReg ? lastReg->regionState() == RenderRegion::RegionOverset : true;
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 597acc6a3ad5d3db5c8c83779098d69f05d85f56..fc58336122c923dd2faff5b8d71a927cc163f1e8 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2012-08-08  Andrei Onea  <onea@adobe.com>
>+
>+        [CSSRegions]regionOverset is computed as "overset" even though the region is not the last in the chain.
>+        https://bugs.webkit.org/show_bug.cgi?id=93102
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Modified existing tests to reflect spec, where Element.webkitRegionOverset can be 
>+        "overset" only for the last region in a region chain, if the content cannot fit inside it.
>+
>+        * fast/regions/element-region-overflow-state-expected.txt:
>+        * fast/regions/element-region-overflow-state-vertical-rl-expected.txt:
>+        * fast/regions/element-region-overflow-state-vertical-rl.html:
>+        * fast/regions/element-region-overflow-state.html:
>+
> 2012-08-07  Joone Hur  <joone.hur@intel.com>
> 
>         Unreviewed EFL gardening.
>diff --git a/LayoutTests/fast/regions/element-region-overflow-state-expected.txt b/LayoutTests/fast/regions/element-region-overflow-state-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..25236be409369d6783818e00ed8c0624741ed259
>--- /dev/null
>+++ b/LayoutTests/fast/regions/element-region-overflow-state-expected.txt
>@@ -0,0 +1,29 @@
>+Tests Element.webkitRegionOverflow attribute
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+  
>+PASS regionOverflow('article') is "undefined"
>+PASS regionOverflow('region_1') is "empty"
>+PASS regionOverflow('region_2') is "empty"
>+PASS regionOverflow('region_3') is "empty"
>+Flow content
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "empty"
>+Add more content
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "fit"
>+Add visual overflow
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "overflow"
>+Empty content
>+PASS regionOverflow('region_1') is "empty"
>+PASS regionOverflow('region_2') is "empty"
>+PASS regionOverflow('region_3') is "empty"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt b/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..25236be409369d6783818e00ed8c0624741ed259
>--- /dev/null
>+++ b/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt
>@@ -0,0 +1,29 @@
>+Tests Element.webkitRegionOverflow attribute
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+  
>+PASS regionOverflow('article') is "undefined"
>+PASS regionOverflow('region_1') is "empty"
>+PASS regionOverflow('region_2') is "empty"
>+PASS regionOverflow('region_3') is "empty"
>+Flow content
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "empty"
>+Add more content
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "fit"
>+Add visual overflow
>+PASS regionOverflow('region_1') is "fit"
>+PASS regionOverflow('region_2') is "fit"
>+PASS regionOverflow('region_3') is "overflow"
>+Empty content
>+PASS regionOverflow('region_1') is "empty"
>+PASS regionOverflow('region_2') is "empty"
>+PASS regionOverflow('region_3') is "empty"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/regions/element-region-overset-state-expected.txt b/LayoutTests/fast/regions/element-region-overset-state-expected.txt
>index 2150f283c0bd37915f0ccb98a3debf666dbf5812..716cb5dfc66dad03ab19e350a62307e89fe3e09b 100644
>--- a/LayoutTests/fast/regions/element-region-overset-state-expected.txt
>+++ b/LayoutTests/fast/regions/element-region-overset-state-expected.txt
>@@ -7,16 +7,16 @@ PASS regionOverset('region_1') is "empty"
> PASS regionOverset('region_2') is "empty"
> PASS regionOverset('region_3') is "empty"
> Flow content
>-PASS regionOverset('region_1') is "overset"
>+PASS regionOverset('region_1') is "fit"
> PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "empty"
> Add more content
>-PASS regionOverset('region_1') is "overset"
>-PASS regionOverset('region_2') is "overset"
>+PASS regionOverset('region_1') is "fit"
>+PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "fit"
> Add visual overflow
>-PASS regionOverset('region_1') is "overset"
>-PASS regionOverset('region_2') is "overset"
>+PASS regionOverset('region_1') is "fit"
>+PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "overset"
> Empty content
> PASS regionOverset('region_1') is "empty"
>diff --git a/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-expected.txt b/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-expected.txt
>index 2150f283c0bd37915f0ccb98a3debf666dbf5812..716cb5dfc66dad03ab19e350a62307e89fe3e09b 100644
>--- a/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-expected.txt
>+++ b/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-expected.txt
>@@ -7,16 +7,16 @@ PASS regionOverset('region_1') is "empty"
> PASS regionOverset('region_2') is "empty"
> PASS regionOverset('region_3') is "empty"
> Flow content
>-PASS regionOverset('region_1') is "overset"
>+PASS regionOverset('region_1') is "fit"
> PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "empty"
> Add more content
>-PASS regionOverset('region_1') is "overset"
>-PASS regionOverset('region_2') is "overset"
>+PASS regionOverset('region_1') is "fit"
>+PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "fit"
> Add visual overflow
>-PASS regionOverset('region_1') is "overset"
>-PASS regionOverset('region_2') is "overset"
>+PASS regionOverset('region_1') is "fit"
>+PASS regionOverset('region_2') is "fit"
> PASS regionOverset('region_3') is "overset"
> Empty content
> PASS regionOverset('region_1') is "empty"
>diff --git a/LayoutTests/fast/regions/element-region-overset-state-vertical-rl.html b/LayoutTests/fast/regions/element-region-overset-state-vertical-rl.html
>index d5f6fd58f7e0efd880766edb9664625d3ad3b801..1f47339830d071e10a9e266f5aace0f0715a067b 100644
>--- a/LayoutTests/fast/regions/element-region-overset-state-vertical-rl.html
>+++ b/LayoutTests/fast/regions/element-region-overset-state-vertical-rl.html
>@@ -76,22 +76,22 @@ body { font-family: monospace; }
>         debug("Flow content");
>         flowContent("article");
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>         shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "empty");
> 
>         debug("Add more content");
>         addMoreContent();
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>-        shouldBeEqualToString("regionOverset('region_2')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>+        shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "fit");
> 
>         debug("Add visual overflow");
>         addVisualOverflow();
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>-        shouldBeEqualToString("regionOverset('region_2')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>+        shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "overset");
> 
>         debug("Empty content");
>diff --git a/LayoutTests/fast/regions/element-region-overset-state.html b/LayoutTests/fast/regions/element-region-overset-state.html
>index 0facff0307843a8c5cc6d30ed890edd77a1464c3..625e5c305032985d1800bee9948f0d04f3f9da58 100644
>--- a/LayoutTests/fast/regions/element-region-overset-state.html
>+++ b/LayoutTests/fast/regions/element-region-overset-state.html
>@@ -69,22 +69,22 @@
>         debug("Flow content");
>         flowContent("article");
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>         shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "empty");
> 
>         debug("Add more content");
>         addMoreContent();
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>-        shouldBeEqualToString("regionOverset('region_2')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>+        shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "fit");
> 
>         debug("Add visual overflow");
>         addVisualOverflow();
> 
>-        shouldBeEqualToString("regionOverset('region_1')", "overset");
>-        shouldBeEqualToString("regionOverset('region_2')", "overset");
>+        shouldBeEqualToString("regionOverset('region_1')", "fit");
>+        shouldBeEqualToString("regionOverset('region_2')", "fit");
>         shouldBeEqualToString("regionOverset('region_3')", "overset");
> 
>         debug("Empty content");

Actions: View | Formatted Diff | Diff

Attachments on bug 93102: 156344 | 157219 | 157239