formalize named picture versions

src/effects/SkDashPathEffect.cpp

-
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
 #include "SkDashPathEffect.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPathMeasure.h"
 
 static inline int is_even(int x) {
     return (~x) << 31;
 }
 
 static SkScalar FindFirstInterval(const SkScalar intervals[], SkScalar phase,
@@ skipping 516 matching lines @@
 void SkDashPathEffect::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fPhase);
     buffer.writeScalarArray(fIntervals, fCount);
 }
 
 SkFlattenable* SkDashPathEffect::CreateProc(SkReadBuffer& buffer) {
     return SkNEW_ARGS(SkDashPathEffect, (buffer));
 }
 
 SkDashPathEffect::SkDashPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {

[robertphillips, 2014/05/20 12:34:06]

overlength - just remove the use of the temp variable?

[reed1, 2014/05/20 17:21:57]

Done.

-    bool useOldPic = buffer.pictureVersion() < 25 && 0 != buffer.pictureVersion();
+    bool useOldPic = buffer.pictureVersionLT(SkReadBuffer::kDashWritesPhaseIntervals_PictureVersion);
     if (useOldPic) {
         fInitialDashIndex = buffer.readInt();
         fInitialDashLength = buffer.readScalar();
         fIntervalLength = buffer.readScalar();
         buffer.readBool(); // Dummy for old ScalarToFit field
     } else {
         fPhase = buffer.readScalar();
     }
 
     fCount = buffer.getArrayCount();
@@ skipping 10 matching lines @@
         if (fInitialDashLength != -1) { // Signal for bad dash interval
             for (int i = 0; i < fInitialDashIndex; ++i) {
                 fPhase += fIntervals[i];
             }
             fPhase += fIntervals[fInitialDashIndex] - fInitialDashLength;
         }
     } else {
         this->setInternalMembers(fPhase);
     }
 }