Title: [87368] trunk
- Revision
- 87368
- Author
- [email protected]
- Date
- 2011-05-26 00:59:44 -0700 (Thu, 26 May 2011)
Log Message
2011-05-26 Shane Stephens <[email protected]>
Reviewed by James Robinson.
REGRESSION (r81992): layout triggered by position update fails to apply when transform is updated at same time
https://bugs.webkit.org/show_bug.cgi?id=60689
* transforms/2d/set-transform-and-top-expected.txt: Added.
* transforms/2d/set-transform-and-top.html: Added.
2011-05-26 Shane Stephens <[email protected]>
Reviewed by James Robinson.
REGRESSION (r81992): layout triggered by position update fails to apply when transform is updated at same time
https://bugs.webkit.org/show_bug.cgi?id=60689
Test: transforms/2d/set-transform-and-top.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::simplifiedLayout):
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (87367 => 87368)
--- trunk/LayoutTests/ChangeLog 2011-05-26 07:44:43 UTC (rev 87367)
+++ trunk/LayoutTests/ChangeLog 2011-05-26 07:59:44 UTC (rev 87368)
@@ -1,3 +1,13 @@
+2011-05-26 Shane Stephens <[email protected]>
+
+ Reviewed by James Robinson.
+
+ REGRESSION (r81992): layout triggered by position update fails to apply when transform is updated at same time
+ https://bugs.webkit.org/show_bug.cgi?id=60689
+
+ * transforms/2d/set-transform-and-top-expected.txt: Added.
+ * transforms/2d/set-transform-and-top.html: Added.
+
2011-05-25 Igor Oliveira <[email protected]>
Reviewed by Antonio Gomes.
Added: trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt (0 => 87368)
--- trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt (rev 0)
+++ trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt 2011-05-26 07:59:44 UTC (rev 87368)
@@ -0,0 +1 @@
+PASS - Element moved past y=250px
Added: trunk/LayoutTests/transforms/2d/set-transform-and-top.html (0 => 87368)
--- trunk/LayoutTests/transforms/2d/set-transform-and-top.html (rev 0)
+++ trunk/LayoutTests/transforms/2d/set-transform-and-top.html 2011-05-26 07:59:44 UTC (rev 87368)
@@ -0,0 +1,53 @@
+<html>
+<head>
+<style>
+.box {
+ width: 100px;
+ height: 100px;
+ background-color: red;
+ position: absolute;
+ top: 60px;
+ left: 40px;
+}
+</style>
+<script type="text/_javascript_">
+
+function runTest() {
+
+ var id1 = "a";
+ var element1 = document.getElementById("a");
+ var y1 = webkitConvertPointFromNodeToPage(element1, new WebKitPoint(0,0)).y;
+
+ var resultString = '';
+ if (y1 > 250) {
+ resultString += "PASS - Element moved past y=250px";
+ } else {
+ resultString += "FAIL - Element still at y=" + y1 + "px";
+ }
+
+ document.body.appendChild(document.createTextNode(resultString));
+
+ if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
+ window.layoutTestController.notifyDone();
+ }
+}
+</script>
+</head>
+<body>
+
+<div class="box" id="a"></div>
+
+<script>
+ if (window.layoutTestController)
+ window.layoutTestController.waitUntilDone();
+
+ setTimeout(move, 10);
+ function move() {
+ document.getElementById('a').style.top = "300px";
+ document.getElementById('a').style.webkitTransform = "rotate(45deg)";
+ setTimeout(runTest, 0);
+ }
+</script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (87367 => 87368)
--- trunk/Source/WebCore/ChangeLog 2011-05-26 07:44:43 UTC (rev 87367)
+++ trunk/Source/WebCore/ChangeLog 2011-05-26 07:59:44 UTC (rev 87368)
@@ -1,3 +1,15 @@
+2011-05-26 Shane Stephens <[email protected]>
+
+ Reviewed by James Robinson.
+
+ REGRESSION (r81992): layout triggered by position update fails to apply when transform is updated at same time
+ https://bugs.webkit.org/show_bug.cgi?id=60689
+
+ Test: transforms/2d/set-transform-and-top.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::simplifiedLayout):
+
2011-05-26 Igor Oliveira <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/rendering/RenderObject.h (87367 => 87368)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-05-26 07:44:43 UTC (rev 87367)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-05-26 07:59:44 UTC (rev 87368)
@@ -431,7 +431,7 @@
bool hasBackground() const { return style()->hasBackground(); }
bool needsLayout() const { return m_needsLayout || m_normalChildNeedsLayout || m_posChildNeedsLayout || m_needsSimplifiedNormalFlowLayout || m_needsPositionedMovementLayout; }
bool selfNeedsLayout() const { return m_needsLayout; }
- bool needsPositionedMovementLayout() const { return m_needsPositionedMovementLayout; }
+ bool needsPositionedMovementLayout() const { return m_needsPositionedMovementLayout || m_needsSimplifiedNormalFlowLayout; }
bool needsPositionedMovementLayoutOnly() const { return m_needsPositionedMovementLayout && !m_needsLayout && !m_normalChildNeedsLayout && !m_posChildNeedsLayout && !m_needsSimplifiedNormalFlowLayout; }
bool posChildNeedsLayout() const { return m_posChildNeedsLayout; }
bool needsSimplifiedNormalFlowLayout() const { return m_needsSimplifiedNormalFlowLayout; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
