Title: [125610] trunk
- Revision
- 125610
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-14 14:36:08 -0700 (Tue, 14 Aug 2012)
Log Message
[CSSRegions]Region overset property is incorectly computed when content has negative letter spacing and is flowed near to the edge of a region
https://bugs.webkit.org/show_bug.cgi?id=92506
Patch by Andrei Onea <o...@adobe.com> on 2012-08-14
Reviewed by Eric Seidel.
Source/WebCore:
When the content which is flowed inside a region creates visual overflow in
the writing direction, the overflow rect is also extended in the other direction, and
that forces regionOverset to become "fit" for all regions.
Tests: fast/regions/element-region-overset-state-negative-letter-spacing.html
fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::computeOverflowStateForRegions):
LayoutTests:
Added tests for incorrect regionOverset computation when visual overflow in the writing direction creates
overset for all regions.
* fast/regions/element-region-overset-state-negative-letter-spacing-expected.txt: Added.
* fast/regions/element-region-overset-state-negative-letter-spacing.html: Added.
* fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing-expected.txt: Added.
* fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (125609 => 125610)
--- trunk/LayoutTests/ChangeLog 2012-08-14 21:35:06 UTC (rev 125609)
+++ trunk/LayoutTests/ChangeLog 2012-08-14 21:36:08 UTC (rev 125610)
@@ -1,3 +1,18 @@
+2012-08-14 Andrei Onea <o...@adobe.com>
+
+ [CSSRegions]Region overset property is incorectly computed when content has negative letter spacing and is flowed near to the edge of a region
+ https://bugs.webkit.org/show_bug.cgi?id=92506
+
+ Reviewed by Eric Seidel.
+
+ Added tests for incorrect regionOverset computation when visual overflow in the writing direction creates
+ overset for all regions.
+
+ * fast/regions/element-region-overset-state-negative-letter-spacing-expected.txt: Added.
+ * fast/regions/element-region-overset-state-negative-letter-spacing.html: Added.
+ * fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing-expected.txt: Added.
+ * fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html: Added.
+
2012-08-14 Florin Malita <fmal...@chromium.org>
beginElement() does not observe updated animation attributes
Added: trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing-expected.txt (0 => 125610)
--- trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing-expected.txt 2012-08-14 21:36:08 UTC (rev 125610)
@@ -0,0 +1,11 @@
+Tests Element.webkitRegionOverset attribute
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS region_1.webkitRegionOverset is "fit"
+PASS region_2.webkitRegionOverset is "empty"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing.html (0 => 125610)
--- trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing.html (rev 0)
+++ trunk/LayoutTests/fast/regions/element-region-overset-state-negative-letter-spacing.html 2012-08-14 21:36:08 UTC (rev 125610)
@@ -0,0 +1,45 @@
+<html>
+<head>
+<script src=""
+<style>
+#content {
+ -webkit-flow-into: article;
+ letter-spacing: -1px;
+ direction: rtl;
+}
+#region_1, #region_2{
+ -webkit-flow-from: article;
+ overset:visible;
+ display:inline-block;
+ vertical-align:top;
+ margin:10px;
+}
+
+#region_1 { height:110px; width:200px; }
+#region_2 { height:110px; width:200px; }
+
+</style>
+</head>
+<body>
+<h1 id="content">Lorem ipsum</h1>
+<div id="region_1"></div>
+<div id="region_2"></div>
+
+<script>
+ description("Tests Element.webkitRegionOverset attribute")
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+ var region_1 = document.getElementById("region_1");
+ var region_2 = document.getElementById("region_2");
+ var content = document.getElementById("content");
+ shouldBeEqualToString("region_1.webkitRegionOverset", "fit");
+ shouldBeEqualToString("region_2.webkitRegionOverset", "empty");
+ document.body.removeChild(region_1);
+ document.body.removeChild(region_2);
+ document.body.removeChild(content);
+
+</script>
+<script src=""
+</body>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing-expected.txt (0 => 125610)
--- trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing-expected.txt 2012-08-14 21:36:08 UTC (rev 125610)
@@ -0,0 +1,11 @@
+Tests Element.webkitRegionoverset attribute
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS region_1.webkitRegionOverset is "fit"
+PASS region_2.webkitRegionOverset is "empty"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html (0 => 125610)
--- trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html (rev 0)
+++ trunk/LayoutTests/fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html 2012-08-14 21:36:08 UTC (rev 125610)
@@ -0,0 +1,50 @@
+<html>
+<head>
+<script src=""
+<style>
+html {
+ -webkit-writing-mode: vertical-rl;
+}
+#content {
+ -webkit-flow-into: article;
+ letter-spacing: -1px;
+ direction: rtl;
+}
+#region_1, #region_2{
+ -webkit-flow-from: article;
+ overset:visible;
+ display:inline-block;
+ vertical-align:top;
+ margin:10px;
+}
+
+#region_1 { height:110px; width:200px; }
+#region_2 { height:110px; width:200px; }
+
+</style>
+</head>
+<body>
+<h1 id="content">Lorem ipsum</h1>
+
+<div id="region_1"></div>
+<div id="region_2"></div>
+
+<script>
+ description("Tests Element.webkitRegionoverset attribute")
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+ var region_1 = document.getElementById("region_1");
+ var region_2 = document.getElementById("region_2");
+ shouldBeEqualToString("region_1.webkitRegionOverset", "fit");
+ shouldBeEqualToString("region_2.webkitRegionOverset", "empty");
+ var content = document.getElementById("content");
+ document.body.removeChild(region_1);
+ document.body.removeChild(region_2);
+ document.body.removeChild(content);
+
+
+</script>
+<script src=""
+</body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (125609 => 125610)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 21:35:06 UTC (rev 125609)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 21:36:08 UTC (rev 125610)
@@ -1,3 +1,20 @@
+2012-08-14 Andrei Onea <o...@adobe.com>
+
+ [CSSRegions]Region overset property is incorectly computed when content has negative letter spacing and is flowed near to the edge of a region
+ https://bugs.webkit.org/show_bug.cgi?id=92506
+
+ Reviewed by Eric Seidel.
+
+ When the content which is flowed inside a region creates visual overflow in
+ the writing direction, the overflow rect is also extended in the other direction, and
+ that forces regionOverset to become "fit" for all regions.
+
+ Tests: fast/regions/element-region-overset-state-negative-letter-spacing.html
+ fast/regions/element-region-overset-state-vertical-rl-negative-letter-spacing.html
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::computeOverflowStateForRegions):
+
2012-08-14 Florin Malita <fmal...@chromium.org>
beginElement() does not observe updated animation attributes
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (125609 => 125610)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-08-14 21:35:06 UTC (rev 125609)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-08-14 21:36:08 UTC (rev 125610)
@@ -678,7 +678,8 @@
// might not be taken into account because the render flow thread height is greater that that regions height + its visual overflow
// because of how computeLogicalHeight is implemented for RenderFlowThread (as a sum of all regions height).
// This means that the middle region will be marked as fit (even if it has visual overflow flowing into the next region)
- if (hasRenderOverflow())
+ if (hasRenderOverflow() && ( (isHorizontalWritingMode() && visualOverflowRect().maxY() > clientBoxRect().maxY())
+ || (!isHorizontalWritingMode() && visualOverflowRect().maxX() > clientBoxRect().maxX())))
height = isHorizontalWritingMode() ? visualOverflowRect().maxY() : visualOverflowRect().maxX();
RenderRegion* lastReg = lastRegion();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
