formalize named picture versions

src/effects/gradients/SkTwoPointConicalGradient.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTwoPointConicalGradient.h"
 
 #include "SkTwoPointConicalGradient_gpu.h"
@@ skipping 333 matching lines @@
     return kConical_GradientType;
 }
 
 SkTwoPointConicalGradient::SkTwoPointConicalGradient(
     SkReadBuffer& buffer)
     : INHERITED(buffer),
     fCenter1(buffer.readPoint()),
     fCenter2(buffer.readPoint()),
     fRadius1(buffer.readScalar()),
     fRadius2(buffer.readScalar()) {
-    if (buffer.pictureVersion() >= 24 || 0 == buffer.pictureVersion()) {
-        fFlippedGrad = buffer.readBool();
-    } else {
+    if (buffer.pictureVersionLT(SkReadBuffer::kGradientFlippedFlag_PictureVersion)) {
         // V23_COMPATIBILITY_CODE
         // Sort gradient by radius size for old pictures
         if (fRadius2 < fRadius1) {
             SkTSwap(fCenter1, fCenter2);
             SkTSwap(fRadius1, fRadius2);
             this->flipGradientColors();
             fFlippedGrad = true;
         } else {
             fFlippedGrad = false;
         }
+    } else {
+        fFlippedGrad = buffer.readBool();
     }
     this->init();
 };
 
 void SkTwoPointConicalGradient::flatten(
     SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writePoint(fCenter1);
     buffer.writePoint(fCenter2);
     buffer.writeScalar(fRadius1);
@@ skipping 39 matching lines @@
     str->appendScalar(fCenter2.fY);
     str->append(") radius2: ");
     str->appendScalar(fRadius2);
     str->append(" ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif