Clean up 4 old bytes per paint.

src/core/SkPaint.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 "SkPaint.h"
 #include "SkAnnotation.h"
@@ skipping 1992 matching lines @@
     return (a << 24) | (b << 16) | (c << 8) | d;
 }
 
 enum FlatFlags {
     kHasTypeface_FlatFlag                      = 0x01,
     kHasEffects_FlatFlag                       = 0x02,
     kHasNonDefaultPaintOptionsAndroid_FlatFlag = 0x04,
 };
 
 // The size of a flat paint's POD fields
-// Include an SkScalar for hinting scale factor whether it is
-// supported or not so that an SKP is valid whether it was
-// created with support or not.
-
-static const uint32_t kPODPaintSize =   6 * sizeof(SkScalar) +
+static const uint32_t kPODPaintSize =   5 * sizeof(SkScalar) +
                                         1 * sizeof(SkColor) +
                                         1 * sizeof(uint16_t) +
                                         6 * sizeof(uint8_t);
 
 /*  To save space/time, we analyze the paint, and write a truncated version of
     it if there are not tricky elements like shaders, etc.
  */
 void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
     uint8_t flatFlags = 0;
     if (this->getTypeface()) {
@@ skipping 16 matching lines @@
     }
 #endif
 
     if (buffer.isOrderedBinaryBuffer()) {
         SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
         uint32_t* ptr = buffer.getOrderedBinaryBuffer()->reserve(kPODPaintSize);
 
         ptr = write_scalar(ptr, this->getTextSize());
         ptr = write_scalar(ptr, this->getTextScaleX());
         ptr = write_scalar(ptr, this->getTextSkewX());
-        // Dummy value for obsolete hinting scale factor.  TODO: remove with next picture version
-        ptr = write_scalar(ptr, SK_Scalar1);
         ptr = write_scalar(ptr, this->getStrokeWidth());
         ptr = write_scalar(ptr, this->getStrokeMiter());
         *ptr++ = this->getColor();
         // previously flags:16, textAlign:8, flatFlags:8
         // now flags:16, hinting:4, textAlign:4, flatFlags:8
         *ptr++ = (this->getFlags() << 16) |
                  // hinting added later. 0 in this nibble means use the default.
                  ((this->getHinting()+1) << 12) |
                  (this->getTextAlign() << 8) |
                  flatFlags;
         *ptr++ = pack_4(this->getStrokeCap(), this->getStrokeJoin(),
                         this->getStyle(), this->getTextEncoding());
     } else {
         buffer.writeScalar(fTextSize);
         buffer.writeScalar(fTextScaleX);
         buffer.writeScalar(fTextSkewX);
-        // Dummy value for obsolete hinting scale factor.  TODO: remove with next picture version
-        buffer.writeScalar(SK_Scalar1);
         buffer.writeScalar(fWidth);
         buffer.writeScalar(fMiterLimit);
         buffer.writeColor(fColor);
         buffer.writeUInt(fFlags);
         buffer.writeUInt(fHinting);
         buffer.writeUInt(fTextAlign);
         buffer.writeUInt(flatFlags);
 
         buffer.writeUInt(fCapType);
         buffer.writeUInt(fJoinType);
@@ skipping 36 matching lines @@
     uint8_t flatFlags = 0;
     if (buffer.isOrderedBinaryBuffer()) {
         SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
         const void* podData = buffer.getOrderedBinaryBuffer()->skip(kPODPaintSize);
         const uint32_t* pod = reinterpret_cast<const uint32_t*>(podData);
 
         // the order we read must match the order we wrote in flatten()
         this->setTextSize(read_scalar(pod));
         this->setTextScaleX(read_scalar(pod));
         this->setTextSkewX(read_scalar(pod));
-        // Skip the hinting scalar factor, which is not supported.
-        read_scalar(pod);
         this->setStrokeWidth(read_scalar(pod));
         this->setStrokeMiter(read_scalar(pod));
         this->setColor(*pod++);
 
         // previously flags:16, textAlign:8, flatFlags:8
         // now flags:16, hinting:4, textAlign:4, flatFlags:8
         uint32_t tmp = *pod++;
         this->setFlags(tmp >> 16);
 
         // hinting added later. 0 in this nibble means use the default.
@@ skipping 462 matching lines @@
             case SkXfermode::kPlus_Mode:
                 return 0 == this->getAlpha();
             case SkXfermode::kDst_Mode:
                 return true;
             default:
                 break;
         }
     }
     return false;
 }