Fix a bug in Save-Restore no-op optimization.

tests/RecordOptsTest.cpp

Index: tests/RecordOptsTest.cpp
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp
index dca948219702fc3210eaeeb7ef56e6b93303c9d1..e17b5e6bfa2a3fd4597b59fff19382912025f902 100644
--- a/tests/RecordOptsTest.cpp
+++ b/tests/RecordOptsTest.cpp
@@ -99,6 +99,23 @@ DEF_TEST(RecordOpts_NoopSaveRestores, r) {
     }
 }
 
+DEF_TEST(RecordOpts_SaveSaveLayerRestoreRestore, r) {
+    SkRecord record;
+    SkRecorder recorder(&record, W, H);
+
+    // A previous bug NoOp'd away the first 3 commands.
+    recorder.save();
+        recorder.saveLayer(NULL, NULL);
+        recorder.restore();
+    recorder.restore();
+
+    SkRecordNoopSaveRestores(&record);
+    assert_type<SkRecords::Save>     (r, record, 0);
+    assert_type<SkRecords::SaveLayer>(r, record, 1);
+    assert_type<SkRecords::Restore>  (r, record, 2);
+    assert_type<SkRecords::Restore>  (r, record, 3);
+}
+
 static void assert_savelayer_restore(skiatest::Reporter* r,
                                      SkRecord* record,
                                      unsigned i,