Add SkRecord::defrag().

tests/RecordTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "RecordTestUtils.h"
+#include "SkBitmap.h"
+#include "SkImageInfo.h"
+#include "SkRecord.h"
+#include "SkRecords.h"
+#include "SkShader.h"
 #include "Test.h"
 
-#include "SkBitmap.h"
-#include "SkImageInfo.h"
-#include "SkShader.h"
-#include "SkRecord.h"
-#include "SkRecords.h"
 
 // Sums the area of any DrawRect command it sees.
 class AreaSummer {
 public:
     AreaSummer() : fArea(0) {}
 
     template <typename T> void operator()(const T&) { }
 
     void operator()(const SkRecords::DrawRect& draw) {
         fArea += (int)(draw.rect.width() * draw.rect.height());
@@ skipping 44 matching lines @@
 
     // Scale 2x.
     Stretch stretch;
     stretch.apply(&record);
 
     // Now its area should be 100 + 400.
     summer.apply(record);
     REPORTER_ASSERT(r, summer.area() == 500);
 }
 
+DEF_TEST(Record_defrag, r) {
+    SkRecord record;
+    APPEND(record, SkRecords::Save);
+    APPEND(record, SkRecords::ClipRect);
+    APPEND(record, SkRecords::NoOp);
+    APPEND(record, SkRecords::DrawRect);
+    APPEND(record, SkRecords::NoOp);
+    APPEND(record, SkRecords::NoOp);
+    APPEND(record, SkRecords::Restore);
+    REPORTER_ASSERT(r, record.count() == 7);
+
+    record.defrag();
+    REPORTER_ASSERT(r, record.count() == 4);
+    assert_type<SkRecords::Save    >(r, record, 0);
+    assert_type<SkRecords::ClipRect>(r, record, 1);
+    assert_type<SkRecords::DrawRect>(r, record, 2);
+    assert_type<SkRecords::Restore >(r, record, 3);
+}
+
 #undef APPEND
 
 template <typename T>
 static bool is_aligned(const T* p) {
     return (((uintptr_t)p) & (sizeof(T) - 1)) == 0;
 }
 
 DEF_TEST(Record_Alignment, r) {
     SkRecord record;
     REPORTER_ASSERT(r, is_aligned(record.alloc<uint8_t>()));
     REPORTER_ASSERT(r, is_aligned(record.alloc<uint16_t>()));
     REPORTER_ASSERT(r, is_aligned(record.alloc<uint32_t>()));
     REPORTER_ASSERT(r, is_aligned(record.alloc<void*>()));
 
     // It's not clear if we care that 8-byte values are aligned on 32-bit machines.
     if (sizeof(void*) == 8) {
         REPORTER_ASSERT(r, is_aligned(record.alloc<double>()));
         REPORTER_ASSERT(r, is_aligned(record.alloc<uint64_t>()));
     }
 }