Tick off some TODOs:

src/core/SkRecordDraw.cpp

Index: src/core/SkRecordDraw.cpp
diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp
index 2bf7076bb05c8cd633acac3820b8b00c4ae3153e..cf1c8f46bd1c9287f6c977d5612886f1146dd0a5 100644
--- a/src/core/SkRecordDraw.cpp
+++ b/src/core/SkRecordDraw.cpp
@@ -7,8 +7,12 @@
 
 #include "SkRecordDraw.h"
 
-void SkRecordDraw(const SkRecord& record, SkCanvas* canvas) {
+void SkRecordDraw(const SkRecord& record, SkCanvas* canvas, SkDrawPictureCallback* callback) {

[robertphillips, 2014/06/24 15:11:08]

maybe:
static const bool kBracketWithAdditionalSaveAndRestore = true;
SkAutoCanvasRestore saveRestore(canvas, kBracketWithAdditionalSaveAndRestore);
?

[mtklein, 2014/06/24 15:16:47]

Done.

+    SkAutoCanvasRestore saveRestore(canvas, true/*also save*/);
     for (SkRecords::Draw draw(canvas); draw.index() < record.count(); draw.next()) {

[robertphillips, 2014/06/24 15:11:08]

NULL != ?

[mtklein, 2014/06/24 15:16:47]

Done.

+        if (callback && callback->abortDrawing()) {
+            return;
+        }
         record.visit<void>(draw.index(), draw);
     }
 }