From 62794eef88fe4cff866205381765f02cd870825f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 7 Sep 2009 12:35:13 +1200
Subject: [PATCH] Bug 510856. Additional scrolling tests.

--HG--
extra : rebase_source : 053c6aae0cc3b458647b296ffb6ce885af2ef7a4
---
 layout/base/tests/region_lib.js         |  5 ++++
 layout/base/tests/scrolling_helper.html | 31 ++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/layout/base/tests/region_lib.js b/layout/base/tests/region_lib.js
index acbdc67c1aee..2bb92612a57c 100644
--- a/layout/base/tests/region_lib.js
+++ b/layout/base/tests/region_lib.js
@@ -99,6 +99,11 @@ Region.prototype.containsRegion = function Region_containsRegion(rgn) {
   return true;
 };
 
+// Return a region which is the union of this region and another region
+Region.prototype.unionRegion = function Region_unionRegion(rgn) {
+  return new Region(this._rects.concat(rgn._rects));
+};
+
 // Returns true if the region covers exactly the same area as region rgn
 Region.prototype.equalsRegion = function Region_equalsRegion(rgn) {
   return this.containsRegion(rgn) && rgn.containsRegion(this);
diff --git a/layout/base/tests/scrolling_helper.html b/layout/base/tests/scrolling_helper.html
index 762d7295886e..6ab4d171fe77 100644
--- a/layout/base/tests/scrolling_helper.html
+++ b/layout/base/tests/scrolling_helper.html
@@ -62,6 +62,14 @@ body > div {
   <div style="height:300px; background:-moz-linear-gradient(top, bottom, from(red), to(black));"></div>
 </div>
 
+<div id="testScrollOutOfView">
+  <div style="height:10px; margin-bottom:210px; background:-moz-linear-gradient(top, bottom, from(rgba(0,0,0,0.7)), to(rgba(255,0,0,0.7)));"></div>
+</div>
+
+<div id="testScrollIntoView">
+  <div style="height:10px; margin-top:210px; background:-moz-linear-gradient(top, bottom, from(rgba(0,0,0,0.7)), to(rgba(255,0,0,0.7)));"></div>
+</div>
+
 <script>
 var tests = document.querySelectorAll("body>div");
 var currentTest = -1;
@@ -124,6 +132,22 @@ function testBorder(blitRegion, paintRegion) {
      "Should repaint area that was scrolled into view");
 }
 
+// Check that scrolling some content out of view updates the area that
+// was displaying the content
+function testScrollOutOfView(blitRegion, paintRegion) {
+  var all = blitRegion.unionRegion(paintRegion);
+  ok(all.containsRect([0,0,200,10]),
+     "Should update everything that was previously visible but scrolled out of view");
+}
+
+// Check that scrolling some content into view updates the area that
+// is displaying the content
+function testScrollIntoView(blitRegion, paintRegion) {
+  var all = blitRegion.unionRegion(paintRegion);
+  ok(all.containsRect([0,190,200,200]),
+     "Should update everything that was previously visible");
+}
+
 function clientRectToRect(cr)
 {
   return [cr.left, cr.top, cr.right, cr.bottom];
@@ -156,7 +180,12 @@ function afterPaint(event) {
   if (blitRegion.isEmpty() && paintRegion.isEmpty())
     return;
 
-  window[tests[currentTest].id](blitRegion, paintRegion);
+  var testFunc = window[tests[currentTest].id];
+  if (!testFunc) {
+    ok(false, "Cannot find test function for " + tests[currentTest].id);
+  } else {
+    testFunc(blitRegion, paintRegion);
+  }
   tests[currentTest].style.display = 'none';
 
   nextTest();