Revert of move annotations to canvas virtual

src/core/SkRemote.h

Index: src/core/SkRemote.h
diff --git a/src/core/SkRemote.h b/src/core/SkRemote.h
index a8126d6c9ebc699b6aab890e5213c8d131191430..a1b1405b2117f74c7e8f34277f13858ee635f601 100644
--- a/src/core/SkRemote.h
+++ b/src/core/SkRemote.h
@@ -79,13 +79,14 @@
         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;