Add deferred texture upload API.

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 76 matching lines @@
                             GrContextFactory* factory);
 }  // namespace skiatest
 
 #define REPORTER_ASSERT(r, cond)                  \
     do {                                          \
         if (!(cond)) {                            \
             REPORT_FAILURE(r, #cond, SkString()); \
         }                                         \
     } while (0)
 
-#define REPORTER_ASSERT_MESSAGE(r, cond, message)        \
-    do {                                                 \
-        if (!(cond)) {                                   \
-            REPORT_FAILURE(r, #cond, SkString(message)); \
-        }                                                \
+#define REPORTER_ASSERT_MESSAGE(r, cond, ...)                       \
+    do {                                                            \
+        if (!(cond)) {                                              \
+            REPORT_FAILURE(r, #cond, SkStringPrintf(__VA_ARGS__));  \
+        }                                                           \
     } while (0)
 
 #define ERRORF(r, ...)                                      \
     do {                                                    \
         REPORT_FAILURE(r, "", SkStringPrintf(__VA_ARGS__)); \
     } while (0)
 
 #define INFOF(REPORTER, ...)         \
     do {                             \
         if ((REPORTER)->verbose()) { \
@@ skipping 46 matching lines @@
     do {                                                                      \
         SkDynamicMemoryWStream testStream;                                    \
         SkAutoTUnref<SkDocument> testDoc(SkDocument::CreatePDF(&testStream)); \
         if (!testDoc) {                                                       \
             INFOF(REPORTER, "PDF disabled; %s test skipped.", #TEST_NAME);    \
             return;                                                           \
         }                                                                     \
     } while (false)
 
 #endif