Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 267 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/RegionTest.cpp b/Source/WebKit/chromium/tests/RegionTest.cpp
index d202ab40c..105d1c3ed 100644
--- a/Source/WebKit/chromium/tests/RegionTest.cpp
+++ b/Source/WebKit/chromium/tests/RegionTest.cpp
@@ -124,4 +124,271 @@ TEST(RegionTest, emptySpan)
         EXPECT_FALSE(rects[i].isEmpty());
 }
 
+#define TEST_NO_INTERSECT(a, b)      \
+{                                    \
+    Region ar = a;                   \
+    Region br = b;                   \
+    EXPECT_FALSE(ar.intersects(br)); \
+    EXPECT_FALSE(br.intersects(ar)); \
+}
+
+#define TEST_INTERSECT(a, b)        \
+{                                   \
+    Region ar = a;                  \
+    Region br = b;                  \
+    EXPECT_TRUE(ar.intersects(br)); \
+    EXPECT_TRUE(br.intersects(ar)); \
+}
+
+TEST(RegionTest, intersectsRegion)
+{
+    Region r;
+
+    TEST_NO_INTERSECT(IntRect(), IntRect());
+    TEST_NO_INTERSECT(IntRect(), IntRect(0, 0, 1, 1));
+    TEST_NO_INTERSECT(IntRect(), IntRect(1, 1, 1, 1));
+
+    r.unite(IntRect(0, 0, 1, 1));
+    TEST_NO_INTERSECT(r, IntRect());
+    TEST_INTERSECT(r, IntRect(0, 0, 1, 1));
+    TEST_INTERSECT(r, IntRect(0, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(-1, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(-1, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(0, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(-1, -1, 3, 3));
+
+    r.unite(IntRect(0, 0, 3, 3));
+    r.unite(IntRect(10, 0, 3, 3));
+    r.unite(IntRect(0, 10, 13, 3));
+    TEST_NO_INTERSECT(r, IntRect());
+    TEST_INTERSECT(r, IntRect(1, 1, 1, 1));
+    TEST_INTERSECT(r, IntRect(0, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(1, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(1, 1, 2, 2));
+    TEST_INTERSECT(r, IntRect(0, 1, 2, 2));
+    TEST_INTERSECT(r, IntRect(0, 0, 3, 3));
+    TEST_INTERSECT(r, IntRect(-1, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(2, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(2, 2, 2, 2));
+    TEST_INTERSECT(r, IntRect(-1, 2, 2, 2));
+
+    TEST_INTERSECT(r, IntRect(11, 1, 1, 1));
+    TEST_INTERSECT(r, IntRect(10, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(11, 0, 2, 2));
+    TEST_INTERSECT(r, IntRect(11, 1, 2, 2));
+    TEST_INTERSECT(r, IntRect(10, 1, 2, 2));
+    TEST_INTERSECT(r, IntRect(10, 0, 3, 3));
+    TEST_INTERSECT(r, IntRect(9, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(12, -1, 2, 2));
+    TEST_INTERSECT(r, IntRect(12, 2, 2, 2));
+    TEST_INTERSECT(r, IntRect(9, 2, 2, 2));
+
+    TEST_INTERSECT(r, IntRect(0, -1, 13, 5));
+    TEST_INTERSECT(r, IntRect(1, -1, 11, 5));
+    TEST_INTERSECT(r, IntRect(2, -1, 9, 5));
+    TEST_INTERSECT(r, IntRect(2, -1, 8, 5));
+    TEST_INTERSECT(r, IntRect(3, -1, 8, 5));
+    TEST_NO_INTERSECT(r, IntRect(3, -1, 7, 5));
+
+    TEST_INTERSECT(r, IntRect(0, 1, 13, 1));
+    TEST_INTERSECT(r, IntRect(1, 1, 11, 1));
+    TEST_INTERSECT(r, IntRect(2, 1, 9, 1));
+    TEST_INTERSECT(r, IntRect(2, 1, 8, 1));
+    TEST_INTERSECT(r, IntRect(3, 1, 8, 1));
+    TEST_NO_INTERSECT(r, IntRect(3, 1, 7, 1));
+
+    TEST_INTERSECT(r, IntRect(0, 0, 13, 13));
+    TEST_INTERSECT(r, IntRect(0, 1, 13, 11));
+    TEST_INTERSECT(r, IntRect(0, 2, 13, 9));
+    TEST_INTERSECT(r, IntRect(0, 2, 13, 8));
+    TEST_INTERSECT(r, IntRect(0, 3, 13, 8));
+    TEST_NO_INTERSECT(r, IntRect(0, 3, 13, 7));
+}
+
+TEST(RegionTest, ReadPastFullSpanVectorInIntersectsTest)
+{
+    Region r;
+
+    // This region has enough spans to fill its allocated Vector exactly.
+    r.unite(IntRect(400, 300, 1, 800));
+    r.unite(IntRect(785, 585, 1, 1));
+    r.unite(IntRect(787, 585, 1, 1));
+    r.unite(IntRect(0, 587, 16, 162));
+    r.unite(IntRect(26, 590, 300, 150));
+    r.unite(IntRect(196, 750, 1, 1));
+    r.unite(IntRect(0, 766, 1, 1));
+    r.unite(IntRect(0, 782, 1, 1));
+    r.unite(IntRect(745, 798, 1, 1));
+    r.unite(IntRect(795, 882, 10, 585));
+    r.unite(IntRect(100, 1499, 586, 1));
+    r.unite(IntRect(100, 1500, 585, 784));
+    // This query rect goes past the bottom of the Region, causing the
+    // test to reach the last span and try go past it. It should not read
+    // memory off the end of the span Vector.
+    TEST_NO_INTERSECT(r, IntRect(0, 2184, 1, 150));
+}
+
+#define TEST_NO_CONTAINS(a, b)     \
+{                                  \
+    Region ar = a;                 \
+    Region br = b;                 \
+    EXPECT_FALSE(ar.contains(br)); \
+}
+
+#define TEST_CONTAINS(a, b)       \
+{                                 \
+    Region ar = a;                \
+    Region br = b;                \
+    EXPECT_TRUE(ar.contains(br)); \
+}
+
+TEST(RegionTest, containsRegion)
+{
+    TEST_CONTAINS(IntRect(), IntRect());
+    TEST_NO_CONTAINS(IntRect(), IntRect(0, 0, 1, 1));
+    TEST_NO_CONTAINS(IntRect(), IntRect(1, 1, 1, 1));
+
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(11, 10, 1, 1));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(10, 11, 1, 1));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(9, 10, 1, 1));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(10, 9, 1, 1));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(9, 9, 2, 2));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(10, 9, 2, 2));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(9, 10, 2, 2));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(10, 10, 2, 2));
+    TEST_NO_CONTAINS(IntRect(10, 10, 1, 1), IntRect(9, 9, 3, 3));
+
+    Region hLines;
+    for (int i = 10; i < 20; i += 2)
+        hLines.unite(IntRect(i, 10, 1, 10));
+
+    TEST_CONTAINS(IntRect(10, 10, 9, 10), hLines);
+    TEST_NO_CONTAINS(IntRect(10, 10, 9, 9), hLines);
+    TEST_NO_CONTAINS(IntRect(10, 11, 9, 9), hLines);
+    TEST_NO_CONTAINS(IntRect(10, 10, 8, 10), hLines);
+    TEST_NO_CONTAINS(IntRect(11, 10, 8, 10), hLines);
+
+    Region vLines;
+    for (int i = 10; i < 20; i += 2)
+        vLines.unite(IntRect(10, i, 10, 1));
+
+    TEST_CONTAINS(IntRect(10, 10, 10, 9), vLines);
+    TEST_NO_CONTAINS(IntRect(10, 10, 9, 9), vLines);
+    TEST_NO_CONTAINS(IntRect(11, 10, 9, 9), vLines);
+    TEST_NO_CONTAINS(IntRect(10, 10, 10, 8), vLines);
+    TEST_NO_CONTAINS(IntRect(10, 11, 10, 8), vLines);
+
+    Region grid;
+    for (int i = 10; i < 20; i += 2)
+        for (int j = 10; j < 20; j += 2)
+            grid.unite(IntRect(i, j, 1, 1));
+
+    TEST_CONTAINS(IntRect(10, 10, 9, 9), grid);
+    TEST_NO_CONTAINS(IntRect(10, 10, 9, 8), grid);
+    TEST_NO_CONTAINS(IntRect(10, 11, 9, 8), grid);
+    TEST_NO_CONTAINS(IntRect(10, 10, 8, 9), grid);
+    TEST_NO_CONTAINS(IntRect(11, 10, 8, 9), grid);
+
+    TEST_CONTAINS(hLines, hLines);
+    TEST_CONTAINS(vLines, vLines);
+    TEST_NO_CONTAINS(vLines, hLines);
+    TEST_NO_CONTAINS(hLines, vLines);
+    TEST_CONTAINS(grid, grid);
+    TEST_CONTAINS(hLines, grid);
+    TEST_CONTAINS(vLines, grid);
+    TEST_NO_CONTAINS(grid, hLines);
+    TEST_NO_CONTAINS(grid, vLines);
+
+    for (int i = 10; i < 20; i += 2)
+        TEST_CONTAINS(hLines, IntRect(i, 10, 1, 10));
+
+    for (int i = 10; i < 20; i += 2)
+        TEST_CONTAINS(vLines, IntRect(10, i, 10, 1));
+
+    for (int i = 10; i < 20; i += 2)
+        for (int j = 10; j < 20; j += 2)
+            TEST_CONTAINS(grid, IntRect(i, j, 1, 1));
+
+    Region container;
+    container.unite(IntRect(0, 0, 40, 20));
+    container.unite(IntRect(0, 20, 41, 20));
+    TEST_CONTAINS(container, IntRect(5, 5, 30, 30));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 10, 10));
+    container.unite(IntRect(0, 30, 10, 10));
+    container.unite(IntRect(30, 30, 10, 10));
+    container.unite(IntRect(30, 0, 10, 10));
+    TEST_NO_CONTAINS(container, IntRect(5, 5, 30, 30));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 10, 10));
+    container.unite(IntRect(0, 30, 10, 10));
+    container.unite(IntRect(30, 0, 10, 40));
+    TEST_NO_CONTAINS(container, IntRect(5, 5, 30, 30));
+
+    container = Region();
+    container.unite(IntRect(30, 0, 10, 10));
+    container.unite(IntRect(30, 30, 10, 10));
+    container.unite(IntRect(0, 0, 10, 40));
+    TEST_NO_CONTAINS(container, IntRect(5, 5, 30, 30));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 10, 40));
+    container.unite(IntRect(30, 0, 10, 40));
+    TEST_NO_CONTAINS(container, IntRect(5, 5, 30, 30));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 40, 40));
+    TEST_NO_CONTAINS(container, IntRect(10, -1, 20, 10));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 40, 40));
+    TEST_NO_CONTAINS(container, IntRect(10, 31, 20, 10));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 40, 20));
+    container.unite(IntRect(0, 20, 41, 20));
+    TEST_NO_CONTAINS(container, IntRect(-1, 10, 10, 20));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 40, 20));
+    container.unite(IntRect(0, 20, 41, 20));
+    TEST_NO_CONTAINS(container, IntRect(31, 10, 10, 20));
+
+    container = Region();
+    container.unite(IntRect(0, 0, 40, 40));
+    container.subtract(IntRect(0, 20, 60, 0));
+    TEST_NO_CONTAINS(container, IntRect(31, 10, 10, 20));
+}
+
+TEST(RegionTest, unite)
+{
+    Region r;
+    Region r2;
+
+    // A rect uniting a contained rect does not change the region.
+    r2 = r = IntRect(0, 0, 50, 50);
+    r2.unite(IntRect(20, 20, 10, 10));
+    EXPECT_EQ(r, r2);
+
+    // A rect uniting a containing rect gives back the containing rect.
+    r = IntRect(0, 0, 50, 50);
+    r.unite(IntRect(0, 0, 100, 100));
+    EXPECT_EQ(Region(IntRect(0, 0, 100, 100)), r);
+
+    // A complex region uniting a contained rect does not change the region.
+    r = IntRect(0, 0, 50, 50);
+    r.unite(IntRect(100, 0, 50, 50));
+    r2 = r;
+    r2.unite(IntRect(20, 20, 10, 10));
+    EXPECT_EQ(r, r2);
+
+    // A complex region uniting a containing rect gives back the containing rect.
+    r = IntRect(0, 0, 50, 50);
+    r.unite(IntRect(100, 0, 50, 50));
+    r. unite(IntRect(0, 0, 500, 500));
+    EXPECT_EQ(Region(IntRect(0, 0, 500, 500)), r);
+}
+
 } // namespace