Diff
Modified: trunk/LayoutTests/ChangeLog (107960 => 107961)
--- trunk/LayoutTests/ChangeLog 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/LayoutTests/ChangeLog 2012-02-16 19:39:53 UTC (rev 107961)
@@ -1,5 +1,17 @@
2012-02-16 Raul Hudea <[email protected]>
+ [CSSRegions]overflowRegion tests are flaky
+ https://bugs.webkit.org/show_bug.cgi?id=78761
+
+ Reviewed by Tony Chang.
+
+ * 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-02-16 Raul Hudea <[email protected]>
+
[CSS Regions] Repaint issues when changing innerHTML of content
https://bugs.webkit.org/show_bug.cgi?id=78787
Modified: trunk/LayoutTests/fast/regions/element-region-overflow-state-expected.txt (107960 => 107961)
--- trunk/LayoutTests/fast/regions/element-region-overflow-state-expected.txt 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/LayoutTests/fast/regions/element-region-overflow-state-expected.txt 2012-02-16 19:39:53 UTC (rev 107961)
@@ -4,10 +4,6 @@
PASS regionOverflow('article') is "undefined"
-PASS regionOverflow('region_1') is "undefined"
-PASS regionOverflow('region_2') is "undefined"
-PASS regionOverflow('region_3') is "undefined"
-After first layout
PASS regionOverflow('region_1') is "empty"
PASS regionOverflow('region_2') is "empty"
PASS regionOverflow('region_3') is "empty"
Modified: trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt (107960 => 107961)
--- trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl-expected.txt 2012-02-16 19:39:53 UTC (rev 107961)
@@ -4,9 +4,6 @@
PASS regionOverflow('article') is "undefined"
-PASS regionOverflow('region_1') is "undefined"
-PASS regionOverflow('region_2') is "undefined"
-PASS regionOverflow('region_3') is "undefined"
PASS regionOverflow('region_1') is "empty"
PASS regionOverflow('region_2') is "empty"
PASS regionOverflow('region_3') is "empty"
Modified: trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html (107960 => 107961)
--- trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/LayoutTests/fast/regions/element-region-overflow-state-vertical-rl.html 2012-02-16 19:39:53 UTC (rev 107961)
@@ -67,24 +67,15 @@
var c = document.getElementById("content");
c.style.width = 596;
}
- function emptyContent() {
-
- }
function test() {
shouldBeEqualToString("regionOverflow('article')", "undefined");
- shouldBeEqualToString("regionOverflow('region_1')", "undefined");
- shouldBeEqualToString("regionOverflow('region_2')", "undefined");
- shouldBeEqualToString("regionOverflow('region_3')", "undefined");
- document.body.offsetTop; // force layout
-
shouldBeEqualToString("regionOverflow('region_1')", "empty");
shouldBeEqualToString("regionOverflow('region_2')", "empty");
shouldBeEqualToString("regionOverflow('region_3')", "empty");
debug("Flow content");
flowContent("article");
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "fit");
@@ -92,7 +83,6 @@
debug("Add more content");
addMoreContent();
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "overflow");
@@ -100,7 +90,6 @@
debug("Add visual overflow");
addVisualOverflow();
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "overflow");
@@ -108,7 +97,6 @@
debug("Empty content");
flowContent("no_article");
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "empty");
shouldBeEqualToString("regionOverflow('region_2')", "empty");
Modified: trunk/LayoutTests/fast/regions/element-region-overflow-state.html (107960 => 107961)
--- trunk/LayoutTests/fast/regions/element-region-overflow-state.html 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/LayoutTests/fast/regions/element-region-overflow-state.html 2012-02-16 19:39:53 UTC (rev 107961)
@@ -62,20 +62,13 @@
}
function test() {
shouldBeEqualToString("regionOverflow('article')", "undefined");
- shouldBeEqualToString("regionOverflow('region_1')", "undefined");
- shouldBeEqualToString("regionOverflow('region_2')", "undefined");
- shouldBeEqualToString("regionOverflow('region_3')", "undefined");
- document.body.offsetTop; // force layout
- debug("After first layout");
-
shouldBeEqualToString("regionOverflow('region_1')", "empty");
shouldBeEqualToString("regionOverflow('region_2')", "empty");
shouldBeEqualToString("regionOverflow('region_3')", "empty");
debug("Flow content");
flowContent("article");
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "fit");
@@ -83,7 +76,6 @@
debug("Add more content");
addMoreContent();
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "overflow");
@@ -91,7 +83,6 @@
debug("Add visual overflow");
addVisualOverflow();
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "overflow");
shouldBeEqualToString("regionOverflow('region_2')", "overflow");
@@ -99,7 +90,6 @@
debug("Empty content");
flowContent("no_article");
- document.body.offsetTop; // force layout
shouldBeEqualToString("regionOverflow('region_1')", "empty");
shouldBeEqualToString("regionOverflow('region_2')", "empty");
Modified: trunk/Source/WebCore/ChangeLog (107960 => 107961)
--- trunk/Source/WebCore/ChangeLog 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/Source/WebCore/ChangeLog 2012-02-16 19:39:53 UTC (rev 107961)
@@ -1,5 +1,17 @@
2012-02-16 Raul Hudea <[email protected]>
+ [CSSRegions]overflowRegion tests are flaky
+ https://bugs.webkit.org/show_bug.cgi?id=78761
+
+ Reviewed by Tony Chang.
+
+ The overflowRegion tests were updated.
+
+ * dom/Element.cpp:
+ (WebCore::Element::webkitRegionOverflow):
+
+2012-02-16 Raul Hudea <[email protected]>
+
[CSS Regions] Repaint issues when changing innerHTML of content
https://bugs.webkit.org/show_bug.cgi?id=78787
Modified: trunk/Source/WebCore/dom/Element.cpp (107960 => 107961)
--- trunk/Source/WebCore/dom/Element.cpp 2012-02-16 19:36:26 UTC (rev 107960)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-02-16 19:39:53 UTC (rev 107961)
@@ -1964,6 +1964,8 @@
const AtomicString& Element::webkitRegionOverflow() const
{
+ document()->updateLayoutIgnorePendingStylesheets();
+
if (renderer() && renderer()->isRenderRegion()) {
RenderRegion* region = toRenderRegion(renderer());
switch (region->regionState()) {
