Backed out changeset 4a3f72dfdfac (bug 1150021) because the wrong patch was uplifted.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 08 Apr 2015 11:55:49 -0400
changeset 266942 830034fc661360352221071d675369834fed3c13
parent 266941 b361047e79ec70976beaede2aacc0949f4da5958
child 266943 aa08b4d5a9aac31297bc6b28927b48de849f7ad9
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1150021
milestone39.0a2
backs out4a3f72dfdfaccfcb19f2cd241aa2ff3394477fc5
Backed out changeset 4a3f72dfdfac (bug 1150021) because the wrong patch was uplifted.
layout/reftests/bugs/1150021-1-ref.css
layout/reftests/bugs/1150021-1-ref.xul
layout/reftests/bugs/1150021-1.css
layout/reftests/bugs/1150021-1.xul
layout/reftests/bugs/reftest.list
layout/xul/nsSprocketLayout.cpp
deleted file mode 100644
--- a/layout/reftests/bugs/1150021-1-ref.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.wide { background: red; width: 800px; height: 30px; display: inline-block;}
-
-#container {
-  background-color: yellow;
-}
-
-#rightBox {
-  margin-left: 1000px;
-}
deleted file mode 100644
--- a/layout/reftests/bugs/1150021-1-ref.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
-
-<?xml-stylesheet type="text/css" href="1150021-1-ref.css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        title="gsg"
-        >
-
-  <vbox id="container">
-    <vbox id="rightBox">
-      <html:span>
-        <html:div class="wide"></html:div><html:div class="wide"></html:div>
-      </html:span>
-    </vbox>
-  </vbox>
-
-
-
-</window>
deleted file mode 100644
--- a/layout/reftests/bugs/1150021-1.css
+++ /dev/null
@@ -1,10 +0,0 @@
-window { direction: rtl; }
-.wide { background: red; width: 800px; height: 30px; display: inline-block;}
-
-#container {
-  background-color: yellow;
-}
-
-#rightBox {
-  margin-left: 1000px;
-}
deleted file mode 100644
--- a/layout/reftests/bugs/1150021-1.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
-
-<?xml-stylesheet type="text/css" href="1150021-1.css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        title="gsg"
-        >
-
-  <vbox id="container">
-    <vbox id="rightBox">
-      <html:span>
-        <html:div class="wide"></html:div><html:div class="wide"></html:div>
-      </html:span>
-    </vbox>
-  </vbox>
-
-
-
-</window>
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1867,9 +1867,8 @@ skip-if(Mulet) == 1120431-2.html 1120431
 == 1121748-2.html 1121748-2-ref.html
 == 1127107-1a-nowrap.html 1127107-1-ref.html
 == 1127107-1b-pre.html 1127107-1-ref.html
 == 1127107-2-capitalize.html 1127107-2-capitalize-ref.html
 == 1127679-1a-inline-flex-relpos.html 1127679-1b-inline-flex-relpos.html
 == 1128354-1.html 1128354-1-ref.html
 == 1130231-1-button-padding-rtl.html 1130231-1-button-padding-rtl-ref.html
 == 1130231-2-button-padding-rtl.html 1130231-2-button-padding-rtl-ref.html
-skip-if(B2G||Mulet) == 1150021-1.xul 1150021-1-ref.xul
--- a/layout/xul/nsSprocketLayout.cpp
+++ b/layout/xul/nsSprocketLayout.cpp
@@ -392,22 +392,17 @@ nsSprocketLayout::Layout(nsIFrame* aBox,
           nextX -= (childBoxSize->left);
         childRect.y = originalClientRect.y;
       }
       else {
         if (frameState & NS_STATE_IS_DIRECTION_NORMAL)
           nextY += (childBoxSize->right);
         else 
           nextY -= (childBoxSize->left);
-        if (GetFrameDirection(aBox) == NS_STYLE_DIRECTION_LTR) {
-          childRect.x = originalClientRect.x;
-        } else {
-          // keep the right edge of the box the same
-          childRect.x = clientRect.x + originalClientRect.width - childRect.width;
-        }
+        childRect.x = originalClientRect.x;
       }
       
       // If we encounter a completely bogus box size, we just leave this child completely
       // alone and continue through the loop to the next child.
       if (childBoxSize->bogus) 
       {
         childComputedBoxSize = childComputedBoxSize->next;
         childBoxSize = childBoxSize->next;
@@ -529,23 +524,16 @@ nsSprocketLayout::Layout(nsIFrame* aBox,
           // width/height between childRect and newChildRect.  So we don't need
           // to reaccount for the left and right of the box layout state again.
           if (frameState & NS_STATE_IS_HORIZONTAL)
             newChildRect.x = childRect.XMost() - newChildRect.width;
           else
             newChildRect.y = childRect.YMost() - newChildRect.height;
         }
 
-        if (!(frameState & NS_STATE_IS_HORIZONTAL)) {
-          if (GetFrameDirection(aBox) != NS_STYLE_DIRECTION_LTR) {
-            // keep the right edge the same
-            newChildRect.x = childRect.XMost() - newChildRect.width;
-          }
-        }
-
         // If the child resized then recompute its position.
         ComputeChildsNextPosition(aBox, x, y, nextX, nextY, newChildRect);
 
         if (newChildRect.width >= margin.left + margin.right && newChildRect.height >= margin.top + margin.bottom) 
           newChildRect.Deflate(margin);
 
         if (childRect.width >= margin.left + margin.right && childRect.height >= margin.top + margin.bottom) 
           childRect.Deflate(margin);