Changeset 83891 in webkit

Timestamp:

Apr 14, 2011 1:50:02 PM (13 years ago)

Author:

enne@google.com

Message:

2011-04-14 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] TilingData should return 1 tile when tile size is texture size.
​https://bugs.webkit.org/show_bug.cgi?id=58364

• platform/graphics/gpu/TilingData.cpp: (WebCore::computeNumTiles):

2011-04-14 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] TilingData should return 1 tile if tile size is texture size.
​https://bugs.webkit.org/show_bug.cgi?id=58364

Update test to properly handle this case.

• tests/TilingDataTest.cpp: (WebCore::TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gpu/TilingData.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/TilingDataTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] TilingData should return 1 tile when tile size is texture size.
+        https://bugs.webkit.org/show_bug.cgi?id=58364
+
+        * platform/graphics/gpu/TilingData.cpp:
+        (WebCore::computeNumTiles):
+
 2011-04-14  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp

@@ -46 +46 @@
 {
     if (maxTextureSize - 2 * borderTexels <= 0)
-        return 0;
+        return totalSize > 0 && maxTextureSize >= totalSize ? 1 : 0;
 
     int numTiles = max(1, 1 + (totalSize - 1 - 2 * borderTexels) / (maxTextureSize - 2 * borderTexels));

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-14  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] TilingData should return 1 tile if tile size is texture size.
+        https://bugs.webkit.org/show_bug.cgi?id=58364
+
+        Update test to properly handle this case.
+
+        * tests/TilingDataTest.cpp:
+        (WebCore::TEST):
+
 2011-04-14  Bill Budge  <bbudge@chromium.org>
 

trunk/Source/WebKit/chromium/tests/TilingDataTest.cpp

@@ -61 +61 @@
     EXPECT_EQ(1, TilingData(1,  1,  1, false).numTiles());
     EXPECT_EQ(2, TilingData(1,  1,  2, false).numTiles());
+    EXPECT_EQ(2, TilingData(1,  2,  1, false).numTiles());
+    EXPECT_EQ(1, TilingData(2,  1,  1, false).numTiles());
+    EXPECT_EQ(1, TilingData(2,  1,  2, false).numTiles());
+    EXPECT_EQ(1, TilingData(2,  2,  1, false).numTiles());
     EXPECT_EQ(1, TilingData(2,  2,  2, false).numTiles());
     EXPECT_EQ(1, TilingData(3,  3,  3, false).numTiles());
@@ -106 +110 @@
     EXPECT_EQ(0, TilingData(0,  1,  1, true).numTiles());
 
-    EXPECT_EQ(0, TilingData(1,  1,  1, true).numTiles());
+    EXPECT_EQ(1, TilingData(1,  1,  1, true).numTiles());
     EXPECT_EQ(0, TilingData(1,  1,  2, true).numTiles());
-    EXPECT_EQ(0, TilingData(2,  2,  2, true).numTiles());
+    EXPECT_EQ(0, TilingData(1,  2,  1, true).numTiles());
+    EXPECT_EQ(1, TilingData(2,  1,  1, true).numTiles());
+    EXPECT_EQ(1, TilingData(2,  1,  2, true).numTiles());
+    EXPECT_EQ(1, TilingData(2,  2,  1, true).numTiles());
+    EXPECT_EQ(1, TilingData(2,  2,  2, true).numTiles());
 
     EXPECT_EQ(1, TilingData(3,  1,  3, true).numTiles());