Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 52 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/TilingDataTest.cpp b/Source/WebKit/chromium/tests/TilingDataTest.cpp
index ec18f01..a41f7fe 100755
--- a/Source/WebKit/chromium/tests/TilingDataTest.cpp
+++ b/Source/WebKit/chromium/tests/TilingDataTest.cpp
@@ -331,4 +331,56 @@ TEST(TilingDataTest, tileSizeY_and_tilePositionY)
     EXPECT_EQ(4, TilingData(3, 100, 6, true).tilePositionY(3));
 }
 
+TEST(TilingDataTest, setTotalSize)
+{
+    TilingData data(5, 5, 5, false);
+    EXPECT_EQ(5, data.totalSizeX());
+    EXPECT_EQ(5, data.totalSizeY());
+    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());
+    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());
+    EXPECT_EQ(1, data.numTilesX());
+    EXPECT_EQ(5, data.tileSizeX(0));
+    EXPECT_EQ(3, data.numTilesY());
+    EXPECT_EQ(5, data.tileSizeY(0));
+    EXPECT_EQ(5, data.tileSizeY(1));
+    EXPECT_EQ(2, data.tileSizeY(2));
+}
+
+TEST(TilingDataTest, setMaxTextureSize)
+{
+    TilingData data(8, 16, 32, false);
+    EXPECT_EQ(2, data.numTilesX());
+    EXPECT_EQ(4, data.numTilesY());
+
+    data.setMaxTextureSize(32);
+    EXPECT_EQ(32, data.maxTextureSize());
+    EXPECT_EQ(1, data.numTilesX());
+    EXPECT_EQ(1, data.numTilesY());
+
+    data.setMaxTextureSize(2);
+    EXPECT_EQ(2, data.maxTextureSize());
+    EXPECT_EQ(8, data.numTilesX());
+    EXPECT_EQ(16, data.numTilesY());
+
+    data.setMaxTextureSize(5);
+    EXPECT_EQ(5, data.maxTextureSize());
+    EXPECT_EQ(4, data.numTilesX());
+    EXPECT_EQ(7, data.numTilesY());
+}
+
 } // namespace