change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories)

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 2081 matching lines @@
     }
     if (flatFlags & kHasEffects_FlatFlag) {
         buffer.writeFlattenable(this->getPathEffect());
         buffer.writeFlattenable(this->getShader());
         buffer.writeFlattenable(this->getXfermode());
         buffer.writeFlattenable(this->getMaskFilter());
         buffer.writeFlattenable(this->getColorFilter());
         buffer.writeFlattenable(this->getRasterizer());
         buffer.writeFlattenable(this->getLooper());
         buffer.writeFlattenable(this->getImageFilter());
-        buffer.writeFlattenable(this->getAnnotation());
+
+        if (fAnnotation) {
+            buffer.writeBool(true);
+            fAnnotation->writeToBuffer(buffer);
+        } else {
+            buffer.writeBool(false);
+        }
     }
 #ifdef SK_BUILD_FOR_ANDROID
     if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
         this->getPaintOptionsAndroid().flatten(buffer);
     }
 #endif
 }
 
 void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
     fPrivFlags = 0;
@@ skipping 60 matching lines @@
 
     if (flatFlags & kHasEffects_FlatFlag) {
         SkSafeUnref(this->setPathEffect(buffer.readFlattenableT<SkPathEffect>()));
         SkSafeUnref(this->setShader(buffer.readFlattenableT<SkShader>()));
         SkSafeUnref(this->setXfermode(buffer.readFlattenableT<SkXfermode>()));
         SkSafeUnref(this->setMaskFilter(buffer.readFlattenableT<SkMaskFilter>()));
         SkSafeUnref(this->setColorFilter(buffer.readFlattenableT<SkColorFilter>()));
         SkSafeUnref(this->setRasterizer(buffer.readFlattenableT<SkRasterizer>()));
         SkSafeUnref(this->setLooper(buffer.readFlattenableT<SkDrawLooper>()));
         SkSafeUnref(this->setImageFilter(buffer.readFlattenableT<SkImageFilter>()));
-        SkSafeUnref(this->setAnnotation(buffer.readFlattenableT<SkAnnotation>()));
+        
+        if (buffer.readBool()) {
+            this->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref();
+        }
     } else {
         this->setPathEffect(NULL);
         this->setShader(NULL);
         this->setXfermode(NULL);
         this->setMaskFilter(NULL);
         this->setColorFilter(NULL);
         this->setRasterizer(NULL);
         this->setLooper(NULL);
         this->setImageFilter(NULL);
     }
@@ skipping 401 matching lines @@
             case SkXfermode::kPlus_Mode:
                 return 0 == this->getAlpha();
             case SkXfermode::kDst_Mode:
                 return true;
             default:
                 break;
         }
     }
     return false;
 }