commit 536ac5e20c2ec2008993c0677ba8cbc5ae0f34cf
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 11 22:38:51 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Feb 11 22:38:51 2014 +0000
tree 2a2c8d98a08e3ad2fecb7ea2d66331a7a713186f
parent 14747e58f8127a6d6b3c748bf0642b0d6a3a79e8

Templetized SkWriter32 readTAt() & overwriteTAt()

Convert SkWriter32::{read,write}32At() to ::{read,overwrite}TAt<>() to allow
peeking/updating arbitrary records.


BUG=skia:
R=mtklein@google.com, reed@google.com, robertphillips@google.com, iancottrell@chromium.org

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/130913018

git-svn-id: http://skia.googlecode.com/svn/trunk@13416 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/Writer32Test.cpp

diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index 4d421c8..a471099 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -102,7 +102,7 @@
     for (size_t i = 0; i < SK_ARRAY_COUNT(data); ++i) {
         REPORTER_ASSERT(reporter, i*4 == writer->bytesWritten());
         writer->write32(data[i]);
-        REPORTER_ASSERT(reporter, data[i] == writer->read32At(i*4));
+        REPORTER_ASSERT(reporter, data[i] == writer->readTAt<uint32_t>(i * 4));
     }
 
     char buffer[sizeof(data)];
@@ -184,6 +184,43 @@
     }
 }
 
+static void testOverwriteT(skiatest::Reporter* reporter, SkWriter32* writer) {
+    const size_t padding = 64;
+
+    const uint32_t uint1 = 0x12345678;
+    const uint32_t uint2 = 0x98765432;
+    const SkScalar scalar1 = 1234.5678f;
+    const SkScalar scalar2 = 9876.5432f;
+    const SkRect rect1 = SkRect::MakeXYWH(1, 2, 3, 4);
+    const SkRect rect2 = SkRect::MakeXYWH(5, 6, 7, 8);
+
+    for (size_t i = 0; i < (padding / 4); ++i) {
+        writer->write32(0);
+    }
+
+    writer->write32(uint1);
+    writer->writeRect(rect1);
+    writer->writeScalar(scalar1);
+
+    for (size_t i = 0; i < (padding / 4); ++i) {
+        writer->write32(0);
+    }
+
+    REPORTER_ASSERT(reporter, writer->readTAt<uint32_t>(padding) == uint1);
+    REPORTER_ASSERT(reporter, writer->readTAt<SkRect>(padding + sizeof(uint32_t)) == rect1);
+    REPORTER_ASSERT(reporter, writer->readTAt<SkScalar>(
+                        padding + sizeof(uint32_t) + sizeof(SkRect)) == scalar1);
+
+    writer->overwriteTAt(padding, uint2);
+    writer->overwriteTAt(padding + sizeof(uint32_t), rect2);
+    writer->overwriteTAt(padding + sizeof(uint32_t) + sizeof(SkRect), scalar2);
+
+    REPORTER_ASSERT(reporter, writer->readTAt<uint32_t>(padding) == uint2);
+    REPORTER_ASSERT(reporter, writer->readTAt<SkRect>(padding + sizeof(uint32_t)) == rect2);
+    REPORTER_ASSERT(reporter, writer->readTAt<SkScalar>(
+                        padding + sizeof(uint32_t) + sizeof(SkRect)) == scalar2);
+}
+
 DEF_TEST(Writer32_dynamic, reporter) {
     SkWriter32 writer;
     test1(reporter, &writer);
@@ -193,6 +230,9 @@
 
     writer.reset();
     testWritePad(reporter, &writer);
+
+    writer.reset();
+    testOverwriteT(reporter, &writer);
 }
 
 DEF_TEST(Writer32_contiguous, reporter) {
@@ -216,6 +256,9 @@
 
     writer.reset();
     testWritePad(reporter, &writer);
+
+    writer.reset();
+    testOverwriteT(reporter, &writer);
 }
 
 DEF_TEST(Writer32_large, reporter) {
@@ -226,6 +269,9 @@
 
     writer.reset();
     testWritePad(reporter, &writer);
+
+    writer.reset();
+    testOverwriteT(reporter, &writer);
 }
 
 DEF_TEST(Writer32_misc, reporter) {