Bug 1398623 - Remove several unused variables in nsSprocketLayout::PopulateBoxSizes r=xidorn
☠☠ backed out by 8c9d50f961f5 ☠ ☠
authorsajattack <sajattack@gmail.com>
Sun, 10 Sep 2017 22:33:13 -0700
changeset 429511 109e5bafd7a34423f6ed3ae03fcd277004fa41a5
parent 429498 1f1893590a1df0ecf2d4f9e2dfdc3223991a942f
child 429512 adcfea5cd531baec52c58f8659c35fe02ac2a56c
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersxidorn
bugs1398623
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1398623 - Remove several unused variables in nsSprocketLayout::PopulateBoxSizes r=xidorn MozReview-Commit-ID: 3VXaVgBhgTL
layout/xul/nsSprocketLayout.cpp
--- a/layout/xul/nsSprocketLayout.cpp
+++ b/layout/xul/nsSprocketLayout.cpp
@@ -731,31 +731,26 @@ nsSprocketLayout::PopulateBoxSizes(nsIFr
     while (currentBox && currentBox->bogus) {
       last = currentBox;
       currentBox = currentBox->next;
     }
     ++childCount;
     nsSize pref(0,0);
     nsSize minSize(0,0);
     nsSize maxSize(NS_INTRINSICSIZE,NS_INTRINSICSIZE);
-    nscoord ascent = 0;
     bool collapsed = child->IsXULCollapsed();
 
     if (!collapsed) {
     // only one flexible child? Cool we will just make its preferred size
     // 0 then and not even have to ask for it.
     //if (flexes != 1)  {
 
       pref = child->GetXULPrefSize(aState);
       minSize = child->GetXULMinSize(aState);
       maxSize = nsBox::BoundsCheckMinMax(minSize, child->GetXULMaxSize(aState));
-      ascent = child->GetXULBoxAscent(aState);
-      nsMargin margin;
-      child->GetXULMargin(margin);
-      ascent += margin.top;
     //}
 
       pref = nsBox::BoundsCheck(minSize, pref, maxSize);
 
       AddMargin(child, pref);
       AddMargin(child, minSize);
       AddMargin(child, maxSize);
     }