Stopped skipping tests in dm of SkPatch

src/core/SkPatch.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 "SkPatch.h"
 
 #include "SkGeometry.h"
 #include "SkColorPriv.h"
+#include "SkBuffer.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Evaluator to sample the values of a cubic bezier using forward differences.
  * Forward differences is a method for evaluating a nth degree polynomial at a uniform step by only
  * adding precalculated values.
  * For a linear example we have the function f(t) = m*t+b, then the value of that function at t+h
  * would be f(t+h) = m*(t+h)+b. If we want to know the uniform step that we must add to the first
  * evaluation f(t) then we need to substract f(t+h) - f(t) = m*t + m*h + b - m*t + b = mh. After
@@ skipping 88 matching lines @@
         return fPoints;
     }
     
 private:
     int fMax, fCurrent, fDivisions;
     SkPoint fFwDiff[4], fCoefs[4], fPoints[4];
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SkPatch::SkPatch(SkPoint points[12], SkColor colors[4]) {
+SkPatch::SkPatch(const SkPoint points[12], const SkColor colors[4]) {
         
     for (int i = 0; i < 12; i++) {
         fCtrlPoints[i] = points[i];
     }
     for (int i = 0; i < 4; i++) {
         fCornerColors[i] = colors[i];
     }
     
 }
 
@@ skipping 98 matching lines @@
                 data->fIndices[i + 3] = data->fIndices[i];
                 data->fIndices[i + 4] = data->fIndices[i + 2];
                 data->fIndices[i + 5] = (x + 1) * stride + y;
             }
             v = SkScalarClampMax(v + 1.f / lodY, 1);
         }
         u = SkScalarClampMax(u + 1.f / lodX, 1);
     }
     return true;
 }
+
+size_t SkPatch::writeToMemory(void* storage) const {

[robertphillips, 2014/08/04 18:44:18]

12 -> kNumControlPts ?
4 -> kNumCornerColors ?

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

Added constants and use them where they are needed. 

+    int byteCount =  12 * sizeof(SkPoint) + 4 * sizeof(SkColor);
+    
+    if (NULL == storage) {
+        return SkAlign4(byteCount);
+    }
+    
+    SkWBuffer buffer(storage);
+    
+    buffer.write(fCtrlPoints, 12 * sizeof(SkPoint));
+    buffer.write(fCornerColors, 4 * sizeof(SkColor));
+    
+    buffer.padToAlign4();
+    return buffer.pos();
+}
+
+size_t SkPatch::readFromMemory(const void* storage, size_t length) {
+    SkRBufferWithSizeCheck buffer(storage, length);
+    
+    int byteCount = 0;
+    

[robertphillips, 2014/08/04 18:44:18]

Can we not just read into fCtrlPoints & fCornerColors ?

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

Done.

+    SkPoint pts[12];
+    if (!buffer.read(pts, 12 * sizeof(SkPoint))) {
+        return byteCount;
+    }
+    for (int i = 0; i < 12; i++) {
+        fCtrlPoints[i] = pts[i];

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

Is this redundant with this->reset(pts, colors) below?

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

Done. Changed it to read directly into fCtrlPoints and fCornerColors.

+    }
+    byteCount += 12 * sizeof(SkPoint);
+    
+    SkColor colors[4];
+    if (!buffer.read(colors, 4 * sizeof(SkColor))) {
+        return byteCount;
+    }
+    for (int i = 0; i < 12; i++) {
+        fCtrlPoints[i] = pts[i];

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

Did you mean to copy the colors here?

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

Also redundant because of this->reset, removed it and adjusted byteCount +=
4*sizeof(SkColor)

+    }
+    byteCount += 12 * sizeof(SkPoint);
+
+    this->reset(pts, colors);
+    
+    return byteCount;
+}