Install a hook to swap between SkPicture backends with a single define.

include/core/SkPictureRecorder.h

Index: include/core/SkPictureRecorder.h
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h
index c00d1b3dfb636d9f26cbb73e6c1592294eb18e77..85e92833f04e1e0bd7ec6f23c8a222ae08b585e6 100644
--- a/include/core/SkPictureRecorder.h
+++ b/include/core/SkPictureRecorder.h
@@ -41,7 +41,17 @@ public:
                              SkBBHFactory* bbhFactory = NULL,
                              uint32_t recordFlags = 0);
 

[robertphillips, 2014/08/21 17:31:00]

rm "As is the Google way," to keep things open sourcy?

[mtklein, 2014/08/21 17:36:51]

Done.

-    /** Same as beginRecording(), using a new faster backend. */
+    // As is the Google way, we have a deprecated old version and a maybe
+    // almost working new version.  We currently point beginRecording() to
+    // DEPRECATED_beginRecording() unless SK_PICTURE_USE_SK_RECORD is defined,
+    // then we use EXPERIMENTAL_beginRecording().
+
+    // Old slower backend.
+    SkCanvas* DEPRECATED_beginRecording(int width, int height,
+                                        SkBBHFactory* bbhFactory = NULL,
+                                        uint32_t recordFlags = 0);
+
+    // New faster backend.
     SkCanvas* EXPERIMENTAL_beginRecording(int width, int height,
                                           SkBBHFactory* bbhFactory = NULL);