Back out changeset cd0be67d2344 (bug 1224307) for test_page_scroll_with_fixed_pos.html bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 12 Nov 2015 20:18:38 -0800
changeset 272372 aa323766c0f998f1c36eb0e8ca821b828a81701d
parent 272371 5c371591bc241f6bf3fe7378162b246b2e81dff1
child 272373 6111fe8aca392635d7ad6136697d636aeb0366ed
push id67938
push userphilringnalda@gmail.com
push dateFri, 13 Nov 2015 04:18:59 +0000
treeherdermozilla-inbound@aa323766c0f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1224307
milestone45.0a1
backs outcd0be67d2344a24b6dae7cb91c03138703ca46c6
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
Back out changeset cd0be67d2344 (bug 1224307) for test_page_scroll_with_fixed_pos.html bustage CLOSED TREE
layout/generic/nsGfxScrollFrame.cpp
layout/generic/test/page_scroll_with_fixed_pos_window.html
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -3702,18 +3702,17 @@ GetScrollPortSizeExcludingHeadersAndFoot
                                             const nsRect& aScrollPort)
 {
   nsTArray<TopAndBottom> list;
   nsFrameList fixedFrames = aViewportFrame->GetChildList(nsIFrame::kFixedList);
   for (nsFrameList::Enumerator iterator(fixedFrames); !iterator.AtEnd();
        iterator.Next()) {
     nsIFrame* f = iterator.get();
     nsRect r = f->GetRect().Intersect(aScrollPort);
-    if ((r.width >= aScrollPort.width / 2 ||
-         r.width >= NSIntPixelsToAppUnits(800, AppUnitsPerCSSPixel())) &&
+    if (r.x == 0 && r.width == aScrollPort.width &&
         r.height <= aScrollPort.height/3) {
       list.AppendElement(TopAndBottom(r.y, r.YMost()));
     }
   }
 
   list.Sort(TopComparator());
   nscoord headerBottom = 0;
   for (uint32_t i = 0; i < list.Length(); ++i) {
--- a/layout/generic/test/page_scroll_with_fixed_pos_window.html
+++ b/layout/generic/test/page_scroll_with_fixed_pos_window.html
@@ -78,29 +78,21 @@ function runTest() {
           is(document.documentElement.scrollTop, fullPageScrollDown - 13,
              "Ignore elements that don't span the entire viewport side");
           document.getElementById("top").style.width = "100%";
 
           showFixedPosElements2(true);
           scrollDownOnePageWithContinuation(function() {
             is(document.documentElement.scrollTop, fullPageScrollDown - (10 + 11 + 9 + 12),
                "Combine multiple overlapping elements");
-            showFixedPosElements2(false);
 
-            document.getElementById("top").style.width = "400px";
-            scrollDownOnePageWithContinuation(function() {
-              is(document.documentElement.scrollTop, fullPageScrollDown - (10 + 13),
-                 "Don't ignore elements that span more than half the viewport side");
-              document.getElementById("top").style.width = "100%";
-
-              // Scroll back up so test results are visible
-              document.documentElement.scrollTop = 0;
-              SimpleTest.finish();
-              window.close();
-            });
+            // Scroll back up so test results are visible
+            document.documentElement.scrollTop = 0;
+            SimpleTest.finish();
+            window.close();
           });
         });
       });
     });
   });
 }
 </script>
 </pre>