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

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

1 files changed, 378 insertions, 356 deletions

diff --git a/Source/WebKit/chromium/tests/TilingDataTest.cpp b/Source/WebKit/chromium/tests/TilingDataTest.cpp
index 47c0361ea..060bc7767 100755
--- a/Source/WebKit/chromium/tests/TilingDataTest.cpp
+++ b/Source/WebKit/chromium/tests/TilingDataTest.cpp
@@ -30,6 +30,7 @@
 
 #include "config.h"
 
+#include "IntSize.h"
 #include "TilingData.h"
 #include <wtf/Assertions.h>
 
@@ -41,8 +42,8 @@ namespace {
 
 class TestTiling : public TilingData {
 public:
-    TestTiling(int maxTextureSize, int totalSizeX, int totalSizeY, bool hasBorderTexels)
-        : TilingData(maxTextureSize, totalSizeX, totalSizeY, hasBorderTexels)
+    TestTiling(IntSize maxTextureSize, IntSize totalSize, bool hasBorderTexels)
+        : TilingData(maxTextureSize, totalSize, hasBorderTexels)
     {
     }
 
@@ -62,402 +63,413 @@ public:
 
 TEST(TilingDataTest, numTiles_NoTiling)
 {
-    EXPECT_EQ(1, TestTiling(16, 16, 16, false).numTiles());
-    EXPECT_EQ(1, TestTiling(16, 15, 15, true).numTiles());
-    EXPECT_EQ(1, TestTiling(16, 16, 16, true).numTiles());
-    EXPECT_EQ(1, TestTiling(16,  1, 16, false).numTiles());
-    EXPECT_EQ(1, TestTiling(15, 15, 15, true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(16, 16), IntSize(16, 16), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(16, 16), IntSize(15, 15), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(16, 16), IntSize(16, 16), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(16, 16), IntSize(1, 16), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(15, 15), IntSize(15, 15), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(32, 16), IntSize(32, 16), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(32, 16), IntSize(32, 16), true).numTiles());
 }
 
 TEST(TilingDataTest, numTiles_TilingNoBorders)
 {
-    EXPECT_EQ(0, TestTiling(0,  0,  0, false).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  4,  0, false).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  0,  4, false).numTiles());
-    EXPECT_EQ(0, TestTiling(4,  4,  0, false).numTiles());
-    EXPECT_EQ(0, TestTiling(4,  0,  4, false).numTiles());
-    EXPECT_EQ(0, TestTiling(-8, 1,  1, false).numTiles());
-    EXPECT_EQ(0, TestTiling(-1, 1,  1, false).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  1,  1, false).numTiles());
-
-    EXPECT_EQ(1, TestTiling(1,  1,  1, false).numTiles());
-    EXPECT_EQ(2, TestTiling(1,  1,  2, false).numTiles());
-    EXPECT_EQ(2, TestTiling(1,  2,  1, false).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  1,  1, false).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  1,  2, false).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  2,  1, false).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  2,  2, false).numTiles());
-    EXPECT_EQ(1, TestTiling(3,  3,  3, false).numTiles());
-
-    EXPECT_EQ(1, TestTiling(4,  1,  4, false).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  2,  4, false).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  3,  4, false).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  4,  4, false).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  5,  4, false).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  6,  4, false).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  7,  4, false).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  8,  4, false).numTiles());
-    EXPECT_EQ(3, TestTiling(4,  9,  4, false).numTiles());
-    EXPECT_EQ(3, TestTiling(4, 10,  4, false).numTiles());
-    EXPECT_EQ(3, TestTiling(4, 11,  4, false).numTiles());
-
-    EXPECT_EQ(1, TestTiling(5,  1,  5, false).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  2,  5, false).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  3,  5, false).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  4,  5, false).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  5,  5, false).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  6,  5, false).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  7,  5, false).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  8,  5, false).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  9,  5, false).numTiles());
-    EXPECT_EQ(2, TestTiling(5, 10,  5, false).numTiles());
-    EXPECT_EQ(3, TestTiling(5, 11,  5, false).numTiles());
-
-    EXPECT_EQ(1, TestTiling(16, 16, 16, false).numTiles());
-    EXPECT_EQ(1, TestTiling(17, 16, 16, false).numTiles());
-    EXPECT_EQ(4, TestTiling(15, 16, 16, false).numTiles());
-    EXPECT_EQ(4, TestTiling(8, 16, 16, false).numTiles());
-    EXPECT_EQ(6, TestTiling(8, 17, 16, false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(0,  0), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(4,  0), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(0,  4), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(4, 4), IntSize(4,  0), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(4, 4), IntSize(0,  4), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(-8, -8), IntSize(1,  1), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(-1, -1), IntSize(1,  1), false).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(1,  1), false).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(1, 1), IntSize(1,  1), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(1, 1), IntSize(1,  2), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(1, 1), IntSize(2,  1), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(1,  1), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(1,  2), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(2,  1), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(2,  2), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(3,  3), false).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(1,  4), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(2,  4), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(3,  4), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(4,  4), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(5,  4), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(6,  4), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(7,  4), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(8,  4), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(4, 4), IntSize(9,  4), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(4, 4), IntSize(10,  4), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(4, 4), IntSize(11,  4), false).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(1,  5), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(2,  5), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(3,  5), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(4,  5), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(5,  5), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(6,  5), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(7,  5), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(8,  5), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(9,  5), false).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(10,  5), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(11,  5), false).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(16, 16), IntSize(16, 16), false).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(17, 17), IntSize(16, 16), false).numTiles());
+    EXPECT_EQ(4, TestTiling(IntSize(15, 15), IntSize(16, 16), false).numTiles());
+    EXPECT_EQ(4, TestTiling(IntSize(8, 8), IntSize(16, 16), false).numTiles());
+    EXPECT_EQ(6, TestTiling(IntSize(8, 8), IntSize(17, 16), false).numTiles());
+
+    EXPECT_EQ(8, TestTiling(IntSize(5, 8), IntSize(17, 16), false).numTiles());
 }
 
 TEST(TilingDataTest, numTiles_TilingWithBorders)
 {
-    EXPECT_EQ(0, TestTiling(0,  0,  0, true).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  4,  0, true).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  0,  4, true).numTiles());
-    EXPECT_EQ(0, TestTiling(4,  4,  0, true).numTiles());
-    EXPECT_EQ(0, TestTiling(4,  0,  4, true).numTiles());
-    EXPECT_EQ(0, TestTiling(-8, 1,  1, true).numTiles());
-    EXPECT_EQ(0, TestTiling(-1, 1,  1, true).numTiles());
-    EXPECT_EQ(0, TestTiling(0,  1,  1, true).numTiles());
-
-    EXPECT_EQ(1, TestTiling(1,  1,  1, true).numTiles());
-    EXPECT_EQ(0, TestTiling(1,  1,  2, true).numTiles());
-    EXPECT_EQ(0, TestTiling(1,  2,  1, true).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  1,  1, true).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  1,  2, true).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  2,  1, true).numTiles());
-    EXPECT_EQ(1, TestTiling(2,  2,  2, true).numTiles());
-
-    EXPECT_EQ(1, TestTiling(3,  1,  3, true).numTiles());
-    EXPECT_EQ(1, TestTiling(3,  2,  3, true).numTiles());
-    EXPECT_EQ(1, TestTiling(3,  3,  3, true).numTiles());
-    EXPECT_EQ(2, TestTiling(3,  4,  3, true).numTiles());
-    EXPECT_EQ(3, TestTiling(3,  5,  3, true).numTiles());
-    EXPECT_EQ(4, TestTiling(3,  6,  3, true).numTiles());
-    EXPECT_EQ(5, TestTiling(3,  7,  3, true).numTiles());
-
-    EXPECT_EQ(1, TestTiling(4,  1,  4, true).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  2,  4, true).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  3,  4, true).numTiles());
-    EXPECT_EQ(1, TestTiling(4,  4,  4, true).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  5,  4, true).numTiles());
-    EXPECT_EQ(2, TestTiling(4,  6,  4, true).numTiles());
-    EXPECT_EQ(3, TestTiling(4,  7,  4, true).numTiles());
-    EXPECT_EQ(3, TestTiling(4,  8,  4, true).numTiles());
-    EXPECT_EQ(4, TestTiling(4,  9,  4, true).numTiles());
-    EXPECT_EQ(4, TestTiling(4, 10,  4, true).numTiles());
-    EXPECT_EQ(5, TestTiling(4, 11,  4, true).numTiles());
-
-    EXPECT_EQ(1, TestTiling(5,  1,  5, true).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  2,  5, true).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  3,  5, true).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  4,  5, true).numTiles());
-    EXPECT_EQ(1, TestTiling(5,  5,  5, true).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  6,  5, true).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  7,  5, true).numTiles());
-    EXPECT_EQ(2, TestTiling(5,  8,  5, true).numTiles());
-    EXPECT_EQ(3, TestTiling(5,  9,  5, true).numTiles());
-    EXPECT_EQ(3, TestTiling(5, 10,  5, true).numTiles());
-    EXPECT_EQ(3, TestTiling(5, 11,  5, true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(0,  0), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(4,  0), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(0,  4), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(4, 4), IntSize(4,  0), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(4, 4), IntSize(0,  4), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(-8, -8), IntSize(1,  1), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(-1, -1), IntSize(1,  1), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(0, 0), IntSize(1,  1), true).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(1, 1), IntSize(1,  1), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(1,  2), true).numTiles());
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(2,  1), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(1,  1), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(1,  2), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(2,  1), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(2, 2), IntSize(2,  2), true).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1,  3), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(2,  3), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(3,  3), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(4,  3), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(5,  3), true).numTiles());
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(6,  3), true).numTiles());
+    EXPECT_EQ(5, TestTiling(IntSize(3, 3), IntSize(7,  3), true).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(1,  4), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(2,  4), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(3,  4), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(4, 4), IntSize(4,  4), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(5,  4), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(4, 4), IntSize(6,  4), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(4, 4), IntSize(7,  4), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(4, 4), IntSize(8,  4), true).numTiles());
+    EXPECT_EQ(4, TestTiling(IntSize(4, 4), IntSize(9,  4), true).numTiles());
+    EXPECT_EQ(4, TestTiling(IntSize(4, 4), IntSize(10,  4), true).numTiles());
+    EXPECT_EQ(5, TestTiling(IntSize(4, 4), IntSize(11,  4), true).numTiles());
+
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(1,  5), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(2,  5), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(3,  5), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(4,  5), true).numTiles());
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(5,  5), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(6,  5), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(7,  5), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(8,  5), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(9,  5), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(10,  5), true).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(11,  5), true).numTiles());
+
+    EXPECT_EQ(30, TestTiling(IntSize(8, 5), IntSize(16, 32), true).numTiles());
 }
 
 TEST(TilingDataTest, tileXIndexFromSrcCoord)
 {
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(3));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(4));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(5));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(6));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(7));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(8));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(9));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(10));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileXIndexFromSrcCoord(11));
-
-    EXPECT_EQ(0, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(2));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(3));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(4));
-    EXPECT_EQ(4, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(5));
-    EXPECT_EQ(5, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(6));
-    EXPECT_EQ(6, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(7));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(8));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(9));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(10));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileXIndexFromSrcCoord(11));
-
-    EXPECT_EQ(0, TestTiling(1, 1, 1, false).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, false).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, false).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileXIndexFromSrcCoord(2));
-
-    EXPECT_EQ(0, TestTiling(3, 4, 3, false).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 4, 3, false).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 4, 3, false).tileXIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 4, 3, false).tileXIndexFromSrcCoord(3));
-
-    EXPECT_EQ(0, TestTiling(1, 1, 1, true).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, true).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, true).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileXIndexFromSrcCoord(2));
-
-    EXPECT_EQ(0, TestTiling(3, 4, 3, true).tileXIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 4, 3, true).tileXIndexFromSrcCoord(1));
-    EXPECT_EQ(1, TestTiling(3, 4, 3, true).tileXIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 4, 3, true).tileXIndexFromSrcCoord(3));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(3));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(4));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(5));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(6));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(7));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(8));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(9));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(10));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileXIndexFromSrcCoord(11));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(2));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(3));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(4));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(5));
+    EXPECT_EQ(5, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(6));
+    EXPECT_EQ(6, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(7));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(8));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(9));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(10));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileXIndexFromSrcCoord(11));
+
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(1, 1), false).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), false).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), false).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileXIndexFromSrcCoord(2));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(4, 3), false).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(4, 3), false).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(4, 3), false).tileXIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(4, 3), false).tileXIndexFromSrcCoord(3));
+
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(1, 1), true).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), true).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), true).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileXIndexFromSrcCoord(2));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(4, 3), true).tileXIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(4, 3), true).tileXIndexFromSrcCoord(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(4, 3), true).tileXIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(4, 3), true).tileXIndexFromSrcCoord(3));
 }
 TEST(TilingDataTest, tileYIndexFromSrcCoord)
 {
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(3));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(4));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(5));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(6));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(7));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(8));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(9));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(10));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, false).tileYIndexFromSrcCoord(11));
-
-    EXPECT_EQ(0, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(1, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(2));
-    EXPECT_EQ(2, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(3));
-    EXPECT_EQ(3, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(4));
-    EXPECT_EQ(4, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(5));
-    EXPECT_EQ(5, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(6));
-    EXPECT_EQ(6, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(7));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(8));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(9));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(10));
-    EXPECT_EQ(7, TestTiling(3, 10, 10, true).tileYIndexFromSrcCoord(11));
-
-    EXPECT_EQ(0, TestTiling(1, 1, 1, false).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, false).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, false).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, false).tileYIndexFromSrcCoord(2));
-
-    EXPECT_EQ(0, TestTiling(3, 3, 4, false).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 4, false).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 4, false).tileYIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 3, 4, false).tileYIndexFromSrcCoord(3));
-
-    EXPECT_EQ(0, TestTiling(1, 1, 1, true).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, true).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(2, 2, 2, true).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(0, TestTiling(3, 3, 3, true).tileYIndexFromSrcCoord(2));
-
-    EXPECT_EQ(0, TestTiling(3, 3, 4, true).tileYIndexFromSrcCoord(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 4, true).tileYIndexFromSrcCoord(1));
-    EXPECT_EQ(1, TestTiling(3, 3, 4, true).tileYIndexFromSrcCoord(2));
-    EXPECT_EQ(1, TestTiling(3, 3, 4, true).tileYIndexFromSrcCoord(3));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(3));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(4));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(5));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(6));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(7));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(8));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(9));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(10));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), false).tileYIndexFromSrcCoord(11));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(2));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(3));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(4));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(5));
+    EXPECT_EQ(5, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(6));
+    EXPECT_EQ(6, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(7));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(8));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(9));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(10));
+    EXPECT_EQ(7, TestTiling(IntSize(3, 3), IntSize(10, 10), true).tileYIndexFromSrcCoord(11));
+
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(1, 1), false).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), false).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), false).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), false).tileYIndexFromSrcCoord(2));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 4), false).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 4), false).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 4), false).tileYIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(3, 4), false).tileYIndexFromSrcCoord(3));
+
+    EXPECT_EQ(0, TestTiling(IntSize(1, 1), IntSize(1, 1), true).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), true).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(2, 2), IntSize(2, 2), true).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 3), true).tileYIndexFromSrcCoord(2));
+
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 4), true).tileYIndexFromSrcCoord(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 4), true).tileYIndexFromSrcCoord(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(3, 4), true).tileYIndexFromSrcCoord(2));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(3, 4), true).tileYIndexFromSrcCoord(3));
 }
 
 TEST(TilingDataTest, tileSizeX)
 {
-    EXPECT_EQ(5, TestTiling(5,  5,  5, false).tileSizeX(0));
-    EXPECT_EQ(5, TestTiling(5,  5,  5, true).tileSizeX(0));
-
-    EXPECT_EQ(5, TestTiling(5,  6,  6, false).tileSizeX(0));
-    EXPECT_EQ(1, TestTiling(5,  6,  6, false).tileSizeX(1));
-    EXPECT_EQ(4, TestTiling(5,  6,  6, true).tileSizeX(0));
-    EXPECT_EQ(2, TestTiling(5,  6,  6, true).tileSizeX(1));
-
-    EXPECT_EQ(5, TestTiling(5,  8,  8, false).tileSizeX(0));
-    EXPECT_EQ(3, TestTiling(5,  8,  8, false).tileSizeX(1));
-    EXPECT_EQ(4, TestTiling(5,  8,  8, true).tileSizeX(0));
-    EXPECT_EQ(4, TestTiling(5,  8,  8, true).tileSizeX(1));
-
-    EXPECT_EQ(5, TestTiling(5, 10, 10, false).tileSizeX(0));
-    EXPECT_EQ(5, TestTiling(5, 10, 10, false).tileSizeX(1));
-    EXPECT_EQ(4, TestTiling(5, 10, 10, true).tileSizeX(0));
-    EXPECT_EQ(3, TestTiling(5, 10, 10, true).tileSizeX(1));
-    EXPECT_EQ(3, TestTiling(5, 10, 10, true).tileSizeX(2));
-
-    EXPECT_EQ(4, TestTiling(5, 11, 11, true).tileSizeX(2));
-    EXPECT_EQ(3, TestTiling(5, 12, 12, true).tileSizeX(2));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(5,  5), false).tileSizeX(0));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(5,  5), true).tileSizeX(0));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(6,  6), false).tileSizeX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(6,  6), false).tileSizeX(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(6,  6), true).tileSizeX(0));
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(6,  6), true).tileSizeX(1));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(8,  8), false).tileSizeX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(8,  8), false).tileSizeX(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(8,  8), true).tileSizeX(0));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(8,  8), true).tileSizeX(1));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(10, 10), false).tileSizeX(0));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(10, 10), false).tileSizeX(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeX(1));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeX(2));
+
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(11, 11), true).tileSizeX(2));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(12, 12), true).tileSizeX(2));
+
+    EXPECT_EQ(3, TestTiling(IntSize(5, 9), IntSize(12, 17), true).tileSizeX(2));
 }
+
 TEST(TilingDataTest, tileSizeY)
 {
-    EXPECT_EQ(5, TestTiling(5,  5,  5, false).tileSizeY(0));
-    EXPECT_EQ(5, TestTiling(5,  5,  5, true).tileSizeY(0));
-
-    EXPECT_EQ(5, TestTiling(5,  6,  6, false).tileSizeY(0));
-    EXPECT_EQ(1, TestTiling(5,  6,  6, false).tileSizeY(1));
-    EXPECT_EQ(4, TestTiling(5,  6,  6, true).tileSizeY(0));
-    EXPECT_EQ(2, TestTiling(5,  6,  6, true).tileSizeY(1));
-
-    EXPECT_EQ(5, TestTiling(5,  8,  8, false).tileSizeY(0));
-    EXPECT_EQ(3, TestTiling(5,  8,  8, false).tileSizeY(1));
-    EXPECT_EQ(4, TestTiling(5,  8,  8, true).tileSizeY(0));
-    EXPECT_EQ(4, TestTiling(5,  8,  8, true).tileSizeY(1));
-
-    EXPECT_EQ(5, TestTiling(5, 10, 10, false).tileSizeY(0));
-    EXPECT_EQ(5, TestTiling(5, 10, 10, false).tileSizeY(1));
-    EXPECT_EQ(4, TestTiling(5, 10, 10, true).tileSizeY(0));
-    EXPECT_EQ(3, TestTiling(5, 10, 10, true).tileSizeY(1));
-    EXPECT_EQ(3, TestTiling(5, 10, 10, true).tileSizeY(2));
-
-    EXPECT_EQ(4, TestTiling(5, 11, 11, true).tileSizeY(2));
-    EXPECT_EQ(3, TestTiling(5, 12, 12, true).tileSizeY(2));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(5,  5), false).tileSizeY(0));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(5,  5), true).tileSizeY(0));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(6,  6), false).tileSizeY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(5, 5), IntSize(6,  6), false).tileSizeY(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(6,  6), true).tileSizeY(0));
+    EXPECT_EQ(2, TestTiling(IntSize(5, 5), IntSize(6,  6), true).tileSizeY(1));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(8,  8), false).tileSizeY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(8,  8), false).tileSizeY(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(8,  8), true).tileSizeY(0));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(8,  8), true).tileSizeY(1));
+
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(10, 10), false).tileSizeY(0));
+    EXPECT_EQ(5, TestTiling(IntSize(5, 5), IntSize(10, 10), false).tileSizeY(1));
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeY(1));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(10, 10), true).tileSizeY(2));
+
+    EXPECT_EQ(4, TestTiling(IntSize(5, 5), IntSize(11, 11), true).tileSizeY(2));
+    EXPECT_EQ(3, TestTiling(IntSize(5, 5), IntSize(12, 12), true).tileSizeY(2));
+
+    EXPECT_EQ(3, TestTiling(IntSize(9, 5), IntSize(17, 12), true).tileSizeY(2));
 }
 
 TEST(TilingDataTest, tileSizeX_and_tilePositionX)
 {
     // Single tile cases:
-    EXPECT_EQ(1, TestTiling(3, 1,   1, false).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 1,   1, false).tilePositionX(0));
-    EXPECT_EQ(1, TestTiling(3, 1, 100, false).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 1, 100, false).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 3,   1, false).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 3,   1, false).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 3, 100, false).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 100, false).tilePositionX(0));
-    EXPECT_EQ(1, TestTiling(3, 1,   1, true).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 1,   1, true).tilePositionX(0));
-    EXPECT_EQ(1, TestTiling(3, 1, 100, true).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 1, 100, true).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 3,   1, true).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 3,   1, true).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 3, 100, true).tileSizeX(0));
-    EXPECT_EQ(0, TestTiling(3, 3, 100, true).tilePositionX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1,   1), false).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1,   1), false).tilePositionX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 100), false).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 100), false).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(3,   1), false).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3,   1), false).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(3, 100), false).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 100), false).tilePositionX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1,   1), true).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1,   1), true).tilePositionX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 100), true).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 100), true).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(3,   1), true).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3,   1), true).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(3, 100), true).tileSizeX(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(3, 100), true).tilePositionX(0));
 
     // Multiple tiles:
     // no border
     // positions 0, 3
-    EXPECT_EQ(2, TestTiling(3, 6,   1, false).numTiles());
-    EXPECT_EQ(3, TestTiling(3, 6,   1, false).tileSizeX(0));
-    EXPECT_EQ(3, TestTiling(3, 6,   1, false).tileSizeX(1));
-    EXPECT_EQ(0, TestTiling(3, 6,   1, false).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 6,   1, false).tilePositionX(1));
-    EXPECT_EQ(3, TestTiling(3, 6, 100, false).tileSizeX(0));
-    EXPECT_EQ(3, TestTiling(3, 6, 100, false).tileSizeX(1));
-    EXPECT_EQ(0, TestTiling(3, 6, 100, false).tilePositionX(0));
-    EXPECT_EQ(3, TestTiling(3, 6, 100, false).tilePositionX(1));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(6,   1), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6,   1), false).tileSizeX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6,   1), false).tileSizeX(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(6,   1), false).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6,   1), false).tilePositionX(1));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6, 100), false).tileSizeX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6, 100), false).tileSizeX(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(6, 100), false).tilePositionX(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6, 100), false).tilePositionX(1));
 
     // Multiple tiles:
     // with border
     // positions 0, 2, 3, 4
-    EXPECT_EQ(4, TestTiling(3, 6,   1, true).numTiles());
-    EXPECT_EQ(2, TestTiling(3, 6,   1, true).tileSizeX(0));
-    EXPECT_EQ(1, TestTiling(3, 6,   1, true).tileSizeX(1));
-    EXPECT_EQ(1, TestTiling(3, 6,   1, true).tileSizeX(2));
-    EXPECT_EQ(2, TestTiling(3, 6,   1, true).tileSizeX(3));
-    EXPECT_EQ(0, TestTiling(3, 6,   1, true).tilePositionX(0));
-    EXPECT_EQ(2, TestTiling(3, 6,   1, true).tilePositionX(1));
-    EXPECT_EQ(3, TestTiling(3, 6,   1, true).tilePositionX(2));
-    EXPECT_EQ(4, TestTiling(3, 6,   1, true).tilePositionX(3));
-    EXPECT_EQ(2, TestTiling(3, 6, 100, true).tileSizeX(0));
-    EXPECT_EQ(1, TestTiling(3, 6, 100, true).tileSizeX(1));
-    EXPECT_EQ(1, TestTiling(3, 6, 100, true).tileSizeX(2));
-    EXPECT_EQ(2, TestTiling(3, 6, 100, true).tileSizeX(3));
-    EXPECT_EQ(0, TestTiling(3, 6, 100, true).tilePositionX(0));
-    EXPECT_EQ(2, TestTiling(3, 6, 100, true).tilePositionX(1));
-    EXPECT_EQ(3, TestTiling(3, 6, 100, true).tilePositionX(2));
-    EXPECT_EQ(4, TestTiling(3, 6, 100, true).tilePositionX(3));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(6,   1), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tileSizeX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tileSizeX(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tileSizeX(2));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tileSizeX(3));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tilePositionX(0));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tilePositionX(1));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tilePositionX(2));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(6,   1), true).tilePositionX(3));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tileSizeX(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tileSizeX(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tileSizeX(2));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tileSizeX(3));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tilePositionX(0));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tilePositionX(1));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tilePositionX(2));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 7), IntSize(6, 100), true).tilePositionX(3));
 }
 
 TEST(TilingDataTest, tileSizeY_and_tilePositionY)
 {
     // Single tile cases:
-    EXPECT_EQ(1, TestTiling(3,   1, 1, false).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3,   1, 1, false).tilePositionY(0));
-    EXPECT_EQ(1, TestTiling(3, 100, 1, false).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3, 100, 1, false).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3,   1, 3, false).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3,   1, 3, false).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3, 100, 3, false).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3, 100, 3, false).tilePositionY(0));
-    EXPECT_EQ(1, TestTiling(3,   1, 1, true).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3,   1, 1, true).tilePositionY(0));
-    EXPECT_EQ(1, TestTiling(3, 100, 1, true).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3, 100, 1, true).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3,   1, 3, true).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3,   1, 3, true).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3, 100, 3, true).tileSizeY(0));
-    EXPECT_EQ(0, TestTiling(3, 100, 3, true).tilePositionY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 1), false).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 1), false).tilePositionY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(100, 1), false).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(100, 1), false).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 3), false).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 3), false).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(100, 3), false).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(100, 3), false).tilePositionY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 1), true).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 1), true).tilePositionY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(100, 1), true).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(100, 1), true).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 3), true).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 3), true).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(100, 3), true).tileSizeY(0));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(100, 3), true).tilePositionY(0));
 
     // Multiple tiles:
     // no border
     // positions 0, 3
-    EXPECT_EQ(2, TestTiling(3,   1, 6, false).numTiles());
-    EXPECT_EQ(3, TestTiling(3,   1, 6, false).tileSizeY(0));
-    EXPECT_EQ(3, TestTiling(3,   1, 6, false).tileSizeY(1));
-    EXPECT_EQ(0, TestTiling(3,   1, 6, false).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3,   1, 6, false).tilePositionY(1));
-    EXPECT_EQ(3, TestTiling(3, 100, 6, false).tileSizeY(0));
-    EXPECT_EQ(3, TestTiling(3, 100, 6, false).tileSizeY(1));
-    EXPECT_EQ(0, TestTiling(3, 100, 6, false).tilePositionY(0));
-    EXPECT_EQ(3, TestTiling(3, 100, 6, false).tilePositionY(1));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(1, 6), false).numTiles());
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 6), false).tileSizeY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 6), false).tileSizeY(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 6), false).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 6), false).tilePositionY(1));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(100, 6), false).tileSizeY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(100, 6), false).tileSizeY(1));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(100, 6), false).tilePositionY(0));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(100, 6), false).tilePositionY(1));
 
     // Multiple tiles:
     // with border
     // positions 0, 2, 3, 4
-    EXPECT_EQ(4, TestTiling(3,   1, 6, true).numTiles());
-    EXPECT_EQ(2, TestTiling(3,   1, 6, true).tileSizeY(0));
-    EXPECT_EQ(1, TestTiling(3,   1, 6, true).tileSizeY(1));
-    EXPECT_EQ(1, TestTiling(3,   1, 6, true).tileSizeY(2));
-    EXPECT_EQ(2, TestTiling(3,   1, 6, true).tileSizeY(3));
-    EXPECT_EQ(0, TestTiling(3,   1, 6, true).tilePositionY(0));
-    EXPECT_EQ(2, TestTiling(3,   1, 6, true).tilePositionY(1));
-    EXPECT_EQ(3, TestTiling(3,   1, 6, true).tilePositionY(2));
-    EXPECT_EQ(4, TestTiling(3,   1, 6, true).tilePositionY(3));
-    EXPECT_EQ(2, TestTiling(3, 100, 6, true).tileSizeY(0));
-    EXPECT_EQ(1, TestTiling(3, 100, 6, true).tileSizeY(1));
-    EXPECT_EQ(1, TestTiling(3, 100, 6, true).tileSizeY(2));
-    EXPECT_EQ(2, TestTiling(3, 100, 6, true).tileSizeY(3));
-    EXPECT_EQ(0, TestTiling(3, 100, 6, true).tilePositionY(0));
-    EXPECT_EQ(2, TestTiling(3, 100, 6, true).tilePositionY(1));
-    EXPECT_EQ(3, TestTiling(3, 100, 6, true).tilePositionY(2));
-    EXPECT_EQ(4, TestTiling(3, 100, 6, true).tilePositionY(3));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(1, 6), true).numTiles());
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tileSizeY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tileSizeY(1));
+    EXPECT_EQ(1, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tileSizeY(2));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tileSizeY(3));
+    EXPECT_EQ(0, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tilePositionY(0));
+    EXPECT_EQ(2, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tilePositionY(1));
+    EXPECT_EQ(3, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tilePositionY(2));
+    EXPECT_EQ(4, TestTiling(IntSize(3, 3), IntSize(1, 6), true).tilePositionY(3));
+    EXPECT_EQ(2, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tileSizeY(0));
+    EXPECT_EQ(1, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tileSizeY(1));
+    EXPECT_EQ(1, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tileSizeY(2));
+    EXPECT_EQ(2, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tileSizeY(3));
+    EXPECT_EQ(0, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tilePositionY(0));
+    EXPECT_EQ(2, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tilePositionY(1));
+    EXPECT_EQ(3, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tilePositionY(2));
+    EXPECT_EQ(4, TestTiling(IntSize(7, 3), IntSize(100, 6), true).tilePositionY(3));
 }
 
 TEST(TilingDataTest, setTotalSize)
 {
-    TestTiling data(5, 5, 5, false);
-    EXPECT_EQ(5, data.totalSizeX());
-    EXPECT_EQ(5, data.totalSizeY());
+    TestTiling data(IntSize(5, 5), IntSize(5, 5), false);
+    EXPECT_EQ(5, data.totalSize().width());
+    EXPECT_EQ(5, data.totalSize().height());
     EXPECT_EQ(1, data.numTilesX());
     EXPECT_EQ(5, data.tileSizeX(0));
     EXPECT_EQ(1, data.numTilesY());
     EXPECT_EQ(5, data.tileSizeY(0));
 
-    data.setTotalSize(6, 5);
-    EXPECT_EQ(6, data.totalSizeX());
-    EXPECT_EQ(5, data.totalSizeY());
+    data.setTotalSize(IntSize(6, 5));
+    EXPECT_EQ(6, data.totalSize().width());
+    EXPECT_EQ(5, data.totalSize().height());
     EXPECT_EQ(2, data.numTilesX());
     EXPECT_EQ(5, data.tileSizeX(0));
     EXPECT_EQ(1, data.tileSizeX(1));
     EXPECT_EQ(1, data.numTilesY());
     EXPECT_EQ(5, data.tileSizeY(0));
 
-    data.setTotalSize(5, 12);
-    EXPECT_EQ(5, data.totalSizeX());
-    EXPECT_EQ(12, data.totalSizeY());
+    data.setTotalSize(IntSize(5, 12));
+    EXPECT_EQ(5, data.totalSize().width());
+    EXPECT_EQ(12, data.totalSize().height());
     EXPECT_EQ(1, data.numTilesX());
     EXPECT_EQ(5, data.tileSizeX(0));
     EXPECT_EQ(3, data.numTilesY());
@@ -468,75 +480,85 @@ TEST(TilingDataTest, setTotalSize)
 
 TEST(TilingDataTest, setMaxTextureSizeNoBorders)
 {
-    TestTiling data(8, 16, 32, false);
+    TestTiling data(IntSize(8, 8), IntSize(16, 32), false);
     EXPECT_EQ(2, data.numTilesX());
     EXPECT_EQ(4, data.numTilesY());
 
-    data.setMaxTextureSize(32);
-    EXPECT_EQ(32, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(32, 32));
+    EXPECT_EQ(IntSize(32, 32), data.maxTextureSize());
     EXPECT_EQ(1, data.numTilesX());
     EXPECT_EQ(1, data.numTilesY());
 
-    data.setMaxTextureSize(2);
-    EXPECT_EQ(2, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(2, 2));
+    EXPECT_EQ(IntSize(2, 2), data.maxTextureSize());
     EXPECT_EQ(8, data.numTilesX());
     EXPECT_EQ(16, data.numTilesY());
 
-    data.setMaxTextureSize(5);
-    EXPECT_EQ(5, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(5, 5));
+    EXPECT_EQ(IntSize(5, 5), data.maxTextureSize());
     EXPECT_EQ(4, data.numTilesX());
     EXPECT_EQ(7, data.numTilesY());
+
+    data.setMaxTextureSize(IntSize(8, 5));
+    EXPECT_EQ(IntSize(8, 5), data.maxTextureSize());
+    EXPECT_EQ(2, data.numTilesX());
+    EXPECT_EQ(7, data.numTilesY());
 }
 
 TEST(TilingDataTest, setMaxTextureSizeBorders)
 {
-    TestTiling data(8, 16, 32, true);
+    TestTiling data(IntSize(8, 8), IntSize(16, 32), true);
     EXPECT_EQ(3, data.numTilesX());
     EXPECT_EQ(5, data.numTilesY());
 
-    data.setMaxTextureSize(32);
-    EXPECT_EQ(32, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(32, 32));
+    EXPECT_EQ(IntSize(32, 32), data.maxTextureSize());
     EXPECT_EQ(1, data.numTilesX());
     EXPECT_EQ(1, data.numTilesY());
 
-    data.setMaxTextureSize(2);
-    EXPECT_EQ(2, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(2, 2));
+    EXPECT_EQ(IntSize(2, 2), data.maxTextureSize());
     EXPECT_EQ(0, data.numTilesX());
     EXPECT_EQ(0, data.numTilesY());
 
-    data.setMaxTextureSize(5);
-    EXPECT_EQ(5, data.maxTextureSize());
+    data.setMaxTextureSize(IntSize(5, 5));
+    EXPECT_EQ(IntSize(5, 5), data.maxTextureSize());
     EXPECT_EQ(5, data.numTilesX());
     EXPECT_EQ(10, data.numTilesY());
+
+    data.setMaxTextureSize(IntSize(8, 5));
+    EXPECT_EQ(IntSize(8, 5), data.maxTextureSize());
+    EXPECT_EQ(3, data.numTilesX());
+    EXPECT_EQ(10, data.numTilesY());
 }
 
 TEST(TilingDataTest, assignment)
 {
     {
-        TestTiling source(8, 16, 32, true);
+        TestTiling source(IntSize(8, 8), IntSize(16, 32), true);
         TestTiling dest = source;
         EXPECT_EQ(source.borderTexels(), dest.borderTexels());
         EXPECT_EQ(source.maxTextureSize(), dest.maxTextureSize());
         EXPECT_EQ(source.numTilesX(), dest.numTilesX());
         EXPECT_EQ(source.numTilesY(), dest.numTilesY());
-        EXPECT_EQ(source.totalSizeX(), dest.totalSizeX());
-        EXPECT_EQ(source.totalSizeY(), dest.totalSizeY());
+        EXPECT_EQ(source.totalSize().width(), dest.totalSize().width());
+        EXPECT_EQ(source.totalSize().height(), dest.totalSize().height());
     }
     {
-        TestTiling source(3, 6, 100, false);
+        TestTiling source(IntSize(7, 3), IntSize(6, 100), false);
         TestTiling dest(source);
         EXPECT_EQ(source.borderTexels(), dest.borderTexels());
         EXPECT_EQ(source.maxTextureSize(), dest.maxTextureSize());
         EXPECT_EQ(source.numTilesX(), dest.numTilesX());
         EXPECT_EQ(source.numTilesY(), dest.numTilesY());
-        EXPECT_EQ(source.totalSizeX(), dest.totalSizeX());
-        EXPECT_EQ(source.totalSizeY(), dest.totalSizeY());
+        EXPECT_EQ(source.totalSize().width(), dest.totalSize().width());
+        EXPECT_EQ(source.totalSize().height(), dest.totalSize().height());
     }
 }
 
 TEST(TilingDataTest, setBorderTexels)
 {
-    TestTiling data(8, 16, 32, false);
+    TestTiling data(IntSize(8, 8), IntSize(16, 32), false);
     EXPECT_EQ(2, data.numTilesX());
     EXPECT_EQ(4, data.numTilesY());