try to deprecate fFlagsMask from SkLayerDrawLooper

src/effects/SkLayerDrawLooper.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 "SkCanvas.h"
 #include "SkColor.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkLayerDrawLooper.h"
 #include "SkString.h"
 #include "SkStringUtils.h"
 #include "SkUnPreMultiply.h"
 
 SkLayerDrawLooper::LayerInfo::LayerInfo() {
-    fFlagsMask = 0;                     // ignore our paint flags
+#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
+    fFlagsMask = 0;                     // ignore layerinfo's paint flags
+#endif
     fPaintBits = 0;                     // ignore our paint fields
     fColorMode = SkXfermode::kDst_Mode; // ignore our color
     fOffset.set(0, 0);
     fPostTranslate = false;
 }
 
 SkLayerDrawLooper::SkLayerDrawLooper()
         : fRecs(NULL),
           fTopRec(NULL),
           fCount(0),
@@ skipping 66 matching lines @@
         }
     }
 }
 
 // Even with kEntirePaint_Bits, we always ensure that the master paint's
 // text-encoding is respected, since that controls how we interpret the
 // text/length parameters of a draw[Pos]Text call.
 void SkLayerDrawLooper::ApplyInfo(SkPaint* dst, const SkPaint& src,
                                   const LayerInfo& info) {
 
+#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
     uint32_t mask = info.fFlagsMask;
     dst->setFlags((dst->getFlags() & ~mask) | (src.getFlags() & mask));
+#endif
     dst->setColor(xferColor(src.getColor(), dst->getColor(), info.fColorMode));
 
     BitFlags bits = info.fPaintBits;
     SkPaint::TextEncoding encoding = dst->getTextEncoding();
 
     if (0 == bits) {
         return;
     }
     if (kEntirePaint_Bits == bits) {
         // we've already computed these, so save it from the assignment
@@ skipping 87 matching lines @@
             count += 1;
         }
         SkASSERT(count == fCount);
     }
 #endif
 
     buffer.writeInt(fCount);
 
     Rec* rec = fRecs;
     for (int i = 0; i < fCount; i++) {
+#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
         buffer.writeInt(rec->fInfo.fFlagsMask);
+#else
+        buffer.writeInt(0); // remove eventually, when we can bump the version
+#endif
         buffer.writeInt(rec->fInfo.fPaintBits);
         buffer.writeInt(rec->fInfo.fColorMode);
         buffer.writePoint(rec->fInfo.fOffset);
         buffer.writeBool(rec->fInfo.fPostTranslate);
         buffer.writePaint(rec->fPaint);
         rec = rec->fNext;
     }
 }
 
 SkFlattenable* SkLayerDrawLooper::CreateProc(SkReadBuffer& buffer) {
     int count = buffer.readInt();
 
     Builder builder;
     for (int i = 0; i < count; i++) {
         LayerInfo info;
+#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
         info.fFlagsMask = buffer.readInt();
+#else
+        (void)buffer.readInt();
+#endif
         info.fPaintBits = buffer.readInt();
         info.fColorMode = (SkXfermode::Mode)buffer.readInt();
         buffer.readPoint(&info.fOffset);
         info.fPostTranslate = buffer.readBool();
         buffer.readPaint(builder.addLayerOnTop(info));
     }
     SkLayerDrawLooper* looper = builder.detachLooper();
     SkASSERT(count == looper->fCount);
 
 #ifdef SK_DEBUG
@@ skipping 12 matching lines @@
 }
 
 #ifdef SK_DEVELOPER
 void SkLayerDrawLooper::toString(SkString* str) const {
     str->appendf("SkLayerDrawLooper (%d): ", fCount);
 
     Rec* rec = fRecs;
     for (int i = 0; i < fCount; i++) {
         str->appendf("%d: ", i);
 
+#ifdef SK_SUPPORT_LEGACY_LAYERDRAWLOOPER_PAINTFLAGS
         str->append("flagsMask: (");
         if (0 == rec->fInfo.fFlagsMask) {
             str->append("None");
         } else {
             bool needSeparator = false;
             SkAddFlagToString(str, SkToBool(SkPaint::kAntiAlias_Flag & rec->fInfo.fFlagsMask),
                               "AntiAlias", &needSeparator);
 //            SkAddFlagToString(str, SkToBool(SkPaint::kFilterBitmap_Flag & rec->fInfo.fFlagsMask), "FilterBitmap", &needSeparator);
             SkAddFlagToString(str, SkToBool(SkPaint::kDither_Flag & rec->fInfo.fFlagsMask),
                               "Dither", &needSeparator);
@@ skipping 13 matching lines @@
                               "LCDRenderText", &needSeparator);
             SkAddFlagToString(str, SkToBool(SkPaint::kEmbeddedBitmapText_Flag & rec->fInfo.fFlagsMask),
                               "EmbeddedBitmapText", &needSeparator);
             SkAddFlagToString(str, SkToBool(SkPaint::kAutoHinting_Flag & rec->fInfo.fFlagsMask),
                               "Autohinted", &needSeparator);
             SkAddFlagToString(str, SkToBool(SkPaint::kVerticalText_Flag & rec->fInfo.fFlagsMask),
                               "VerticalText", &needSeparator);
             SkAddFlagToString(str, SkToBool(SkPaint::kGenA8FromLCD_Flag & rec->fInfo.fFlagsMask),
                               "GenA8FromLCD", &needSeparator);
         }
+#endif
         str->append(") ");
 
         str->append("paintBits: (");
         if (0 == rec->fInfo.fPaintBits) {
             str->append("None");
         } else if (kEntirePaint_Bits == rec->fInfo.fPaintBits) {
             str->append("EntirePaint");
         } else {
             bool needSeparator = false;
             SkAddFlagToString(str, SkToBool(kStyle_Bit & rec->fInfo.fPaintBits), "Style",
@@ skipping 98 matching lines @@
     SkLayerDrawLooper* looper = SkNEW(SkLayerDrawLooper);
     looper->fCount = fCount;
     looper->fRecs = fRecs;
 
     fCount = 0;
     fRecs = NULL;
     fTopRec = NULL;
 
     return looper;
 }