Stopped skipping tests in dm of SkPatch

src/core/SkPictureRecord.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureRecord.h"
 #include "SkTSearch.h"
 #include "SkPixelRef.h"
@@ skipping 75 matching lines @@
         0,  // CLIP_RRECT - no paint
         0,  // CONCAT - no paint
         1,  // DRAW_BITMAP - right after op code
         1,  // DRAW_BITMAP_MATRIX - right after op code
         1,  // DRAW_BITMAP_NINE - right after op code
         1,  // DRAW_BITMAP_RECT_TO_RECT - right after op code
         0,  // DRAW_CLEAR - no paint
         0,  // DRAW_DATA - no paint
         1,  // DRAW_OVAL - right after op code
         1,  // DRAW_PAINT - right after op code
+        1,  // DRAW_PATCH - right after op code
         1,  // DRAW_PATH - right after op code
         0,  // DRAW_PICTURE - no paint
         1,  // DRAW_POINTS - right after op code
         1,  // DRAW_POS_TEXT - right after op code
         1,  // DRAW_POS_TEXT_TOP_BOTTOM - right after op code
         1,  // DRAW_POS_TEXT_H - right after op code
         1,  // DRAW_POS_TEXT_H_TOP_BOTTOM - right after op code
         1,  // DRAW_RECT - right after op code
         1,  // DRAW_RRECT - right after op code
         1,  // DRAW_SPRITE - right after op code
@@ skipping 1367 matching lines @@
         fWriter.writePad(indices, indexCount * sizeof(uint16_t));
     }
     if (flags & DRAW_VERTICES_HAS_XFER) {
         SkXfermode::Mode mode = SkXfermode::kModulate_Mode;
         (void)xfer->asMode(&mode);
         this->addInt(mode);
     }
     this->validate(initialOffset, size);
 }
 
+void SkPictureRecord::drawPatch(const SkPatch& patch, const SkPaint& paint) {
+    //TODO: drawPatch

[mtklein, 2014/08/04 18:23:03]

?

[dandov, 2014/08/04 19:59:27]

Done.

+    
+#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
+    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
+#endif
+    
+    // op + paint index + path index

[mtklein, 2014/08/04 18:23:03]

please update comment

[dandov, 2014/08/04 19:59:27]

Done.

+    size_t size = 2 * kUInt32Size + 12 * sizeof(SkPoint) + 4 * sizeof(SkColor);
+    size_t initialOffset = this->addDraw(DRAW_PATCH, &size);
+    SkASSERT(initialOffset+getPaintOffset(DRAW_PATCH, size) == fWriter.bytesWritten());
+    this->addPaint(paint);
+    this->addPatch(patch);
+    this->validate(initialOffset, size);
+}
+
 void SkPictureRecord::drawData(const void* data, size_t length) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
 #endif
 
     // op + length + 'length' worth of data
     size_t size = 2 * kUInt32Size + SkAlign4(length);
     size_t initialOffset = this->addDraw(DRAW_DATA, &size);
     this->addInt(SkToInt(length));
@@ skipping 113 matching lines @@
     return fPathHeap->insert(path);
 #else
     return fPathHeap->append(path);
 #endif
 }
 
 void SkPictureRecord::addPath(const SkPath& path) {
     this->addInt(this->addPathToHeap(path));
 }
 
+void SkPictureRecord::addPatch(const SkPatch& patch) {

[mtklein, 2014/08/04 18:23:03]

Isn't this just fWriter.writePatch(patch); ?

[dandov, 2014/08/04 19:59:27]

Done.

+    const SkPoint* pts = patch.getControlPoints();
+    for (int i = 0; i < 12; i++) {
+        this->addPoint(pts[i]);
+    }
+    
+    const SkColor* colors = patch.getColors();
+    for (int i = 0; i < 4; i++) {
+        this->addInt(colors[i]);
+    }
+}
+
 void SkPictureRecord::addPicture(const SkPicture* picture) {
     int index = fPictureRefs.find(picture);
     if (index < 0) {    // not found
         index = fPictureRefs.count();
         *fPictureRefs.append() = picture;
         picture->ref();
     }
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
@@ skipping 195 matching lines @@
 void SkPictureRecord::validateRegions() const {
     int count = fRegions.count();
     SkASSERT((unsigned) count < 0x1000);
     for (int index = 0; index < count; index++) {
         const SkFlatData* region = fRegions[index];
         SkASSERT(region);
 //        region->validate();
     }
 }
 #endif