Title: [87432] trunk
Revision
87432
Author
[email protected]
Date
2011-05-26 14:39:33 -0700 (Thu, 26 May 2011)

Log Message

2011-05-26  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r87368.
        http://trac.webkit.org/changeset/87368
        https://bugs.webkit.org/show_bug.cgi?id=61564

        Wrong approach, will do the wrong thing if the element needs
        simplified normal flow layout but is not positioned (Requested
        by jamesr on #webkit).

        * transforms/2d/set-transform-and-top-expected.txt: Removed.
        * transforms/2d/set-transform-and-top.html: Removed.
2011-05-26  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r87368.
        http://trac.webkit.org/changeset/87368
        https://bugs.webkit.org/show_bug.cgi?id=61564

        Wrong approach, will do the wrong thing if the element needs
        simplified normal flow layout but is not positioned (Requested
        by jamesr on #webkit).

        * rendering/RenderObject.h:
        (WebCore::RenderObject::needsPositionedMovementLayout):

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (87431 => 87432)


--- trunk/LayoutTests/ChangeLog	2011-05-26 21:37:05 UTC (rev 87431)
+++ trunk/LayoutTests/ChangeLog	2011-05-26 21:39:33 UTC (rev 87432)
@@ -1,3 +1,16 @@
+2011-05-26  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r87368.
+        http://trac.webkit.org/changeset/87368
+        https://bugs.webkit.org/show_bug.cgi?id=61564
+
+        Wrong approach, will do the wrong thing if the element needs
+        simplified normal flow layout but is not positioned (Requested
+        by jamesr on #webkit).
+
+        * transforms/2d/set-transform-and-top-expected.txt: Removed.
+        * transforms/2d/set-transform-and-top.html: Removed.
+
 2011-05-02  Robert Hogan  <[email protected]>
 
         Reviewed by Adam Roben.

Deleted: trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt (87431 => 87432)


--- trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt	2011-05-26 21:37:05 UTC (rev 87431)
+++ trunk/LayoutTests/transforms/2d/set-transform-and-top-expected.txt	2011-05-26 21:39:33 UTC (rev 87432)
@@ -1 +0,0 @@
-PASS - Element moved past y=250px

Deleted: trunk/LayoutTests/transforms/2d/set-transform-and-top.html (87431 => 87432)


--- trunk/LayoutTests/transforms/2d/set-transform-and-top.html	2011-05-26 21:37:05 UTC (rev 87431)
+++ trunk/LayoutTests/transforms/2d/set-transform-and-top.html	2011-05-26 21:39:33 UTC (rev 87432)
@@ -1,53 +0,0 @@
-<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 (87431 => 87432)


--- trunk/Source/WebCore/ChangeLog	2011-05-26 21:37:05 UTC (rev 87431)
+++ trunk/Source/WebCore/ChangeLog	2011-05-26 21:39:33 UTC (rev 87432)
@@ -1,3 +1,16 @@
+2011-05-26  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r87368.
+        http://trac.webkit.org/changeset/87368
+        https://bugs.webkit.org/show_bug.cgi?id=61564
+
+        Wrong approach, will do the wrong thing if the element needs
+        simplified normal flow layout but is not positioned (Requested
+        by jamesr on #webkit).
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::needsPositionedMovementLayout):
+
 2011-05-02  Robert Hogan  <[email protected]>
 
         Reviewed by Adam Roben.

Modified: trunk/Source/WebCore/rendering/RenderObject.h (87431 => 87432)


--- trunk/Source/WebCore/rendering/RenderObject.h	2011-05-26 21:37:05 UTC (rev 87431)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2011-05-26 21:39:33 UTC (rev 87432)
@@ -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 || m_needsSimplifiedNormalFlowLayout; }
+    bool needsPositionedMovementLayout() const { return m_needsPositionedMovementLayout; }
     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

Reply via email to