Backed out changeset ff82389380c1 (temporary debugging code for bug 1265280) since it's only needed on nightly. a=KWierso for CLOSED TREE
authorL. David Baron <dbaron@dbaron.org>
Mon, 25 Apr 2016 18:01:43 -0700
changeset 332610 ca6ab5be342e2d7817b0015447872dab3ecd5ef1
parent 332609 80befee8ec527372547b547cc592e555d3b6c11a
child 332611 cbeae0c4410bef3864b3d3f4ad939321c61cb15b
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKWierso
bugs1265280
milestone48.0a2
backs outff82389380c1e4c550314ffe536191075a405b0b
Backed out changeset ff82389380c1 (temporary debugging code for bug 1265280) since it's only needed on nightly. a=KWierso for CLOSED TREE
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2163,24 +2163,16 @@ static bool IsCSSOrderLEQ(nsDisplayItem*
   nsIFrame* frame2 = aItem2->Frame();
   int32_t order1 = frame1 ? frame1->StylePosition()->mOrder : 0;
   int32_t order2 = frame2 ? frame2->StylePosition()->mOrder : 0;
   return order1 <= order2;
 }
 
 static bool IsZOrderLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,
                         void* aClosure) {
-  {
-    // TEMPORARY debugging code for bug 1265280
-    nsIFrame* f2 = aItem2->Frame();
-    if (!f2 || !f2->StyleContext()) {
-      NS_RUNTIMEABORT(nsPrintfCString("bad display item %p type %s frame %p",
-                                      aItem2, aItem2->Name(), f2).get());
-    }
-  }
   // Note that we can't just take the difference of the two
   // z-indices here, because that might overflow a 32-bit int.
   return aItem1->ZIndex() <= aItem2->ZIndex();
 }
 
 void nsDisplayList::SortByZOrder() {
   Sort(IsZOrderLEQ, nullptr);
 }