Revert of move annotations to canvas virtual

src/core/SkRemote.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRemote_DEFINED
 #define SkRemote_DEFINED
 
@@ skipping 61 matching lines @@
         virtual ID define(const Stroke&)     = 0;
         virtual ID define(const SkTextBlob*) = 0;
         virtual ID define(SkPathEffect*)     = 0;
         virtual ID define(SkShader*)         = 0;
         virtual ID define(SkXfermode*)       = 0;
         virtual ID define(SkMaskFilter*)     = 0;
         virtual ID define(SkColorFilter*)    = 0;
         virtual ID define(SkRasterizer*)     = 0;
         virtual ID define(SkDrawLooper*)     = 0;
         virtual ID define(SkImageFilter*)    = 0;
+        virtual ID define(SkAnnotation*)     = 0;
 
         virtual void undefine(ID) = 0;
 
         // TODO: do these all belong here in CommonIDs?
         struct CommonIDs {
             ID misc, patheffect, shader, xfermode, maskfilter,
-               colorfilter, rasterizer, looper, imagefilter;
+               colorfilter, rasterizer, looper, imagefilter, annotation;
         };
 
         virtual void    save() = 0;
         virtual void restore() = 0;
         virtual void saveLayer(ID bounds, CommonIDs, uint32_t saveLayerFlags) = 0;
 
         virtual void setMatrix(ID matrix) = 0;
 
         virtual void   clipPath(ID path, SkRegion::Op, bool aa)         = 0;
         virtual void   fillPath(ID path, CommonIDs)                     = 0;
         virtual void strokePath(ID path, CommonIDs, ID stroke)          = 0;
         virtual void   fillText(ID text, SkPoint, CommonIDs)            = 0;
         virtual void strokeText(ID text, SkPoint, CommonIDs, ID stroke) = 0;
     };
 
     // None of these factories take ownership of their arguments.
 
     // Returns a new SkCanvas that translates to the Encoder API.
     SkCanvas* NewCanvas(Encoder*);
     // Returns an Encoder that translates back to the SkCanvas API.
     Encoder* NewDecoder(SkCanvas*);
     // Wraps another Encoder with a cache.  TODO: parameterize
     Encoder* NewCachingEncoder(Encoder*);
 
 }  // namespace SkRemote
 
 #endif//SkRemote_DEFINED