Fix for potential typedef issue

include/core/SkXfermode.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkXfermode_DEFINED
 #define SkXfermode_DEFINED
 
 #include "SkFlattenable.h"
 #include "SkColor.h"
 
 class GrContext;
 class GrEffectRef;
 class GrTexture;
 class SkString;
 
 /** \class SkXfermode
 
     SkXfermode is the base class for objects that are called to implement custom
     "transfer-modes" in the drawing pipeline. The static function Create(Modes)
     can be called to return an instance of any of the predefined subclasses as
     specified in the Modes enum. When an SkXfermode is assigned to an SkPaint,
     then objects drawn with that paint have the xfermode applied.
 */
 class SK_API SkXfermode : public SkFlattenable {
+    typedef SkFlattenable INHERITED;
+
 public:
     SK_DECLARE_INST_COUNT(SkXfermode)
 
     SkXfermode() {}
 
     virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const;
     virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const;
     virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
@@ skipping 190 matching lines @@
 
         This method will not be called directly by the client, so it need not
         be implemented if your subclass has overridden xfer32/xfer16/xferA8
     */
     virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
 
 private:
     enum {
         kModeCount = kLastMode + 1
     };
-    typedef SkFlattenable INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /** \class SkProcXfermode
 
     SkProcXfermode is a xfermode that applies the specified proc to its colors.
     This class is not exported to java.
 */
 class SkProcXfermode : public SkXfermode {
+    typedef SkXfermode INHERITED;
+
 public:
     SkProcXfermode(SkXfermodeProc proc) : fProc(proc) {}
 
     // overrides from SkXfermode
     virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const SK_OVERRIDE;
     virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const SK_OVERRIDE;
     virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const SK_OVERRIDE;
 
     SK_DEVELOPER_TO_STRING()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode)
 
 protected:
     SkProcXfermode(SkFlattenableReadBuffer&);
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
     // allow subclasses to update this after we unflatten
     void setProc(SkXfermodeProc proc) {
         fProc = proc;
     }
 
 private:
     SkXfermodeProc  fProc;
-
-    typedef SkXfermode INHERITED;
 };
 
 #endif