Merge to XFA: Kill CFX_Object.

core/src/fxge/skia/fx_skia_device.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "../../../include/fxge/fx_ge.h"
 //#define _SKIA_SUPPORT_
 #if defined(_SKIA_SUPPORT_)
 #include "../../../include/fxcodec/fx_codec.h"
 
 
@@ skipping 99 matching lines @@
         } else {        // hairline
                 if (paint->isAntiAlias()) {
                         proc = SkScan::AntiHairPath;
                 } else {
                         proc = SkScan::HairPath;
                 }
         }
         proc(*devPathPtr, rect, blitter);
 }
 
-class CSkia_PathData : public CFX_Object
+class CSkia_PathData 
 {
 public:
         CSkia_PathData() {}
         ~CSkia_PathData() {}
         SkPath                  m_PathData;
 
         void                    BuildPath(const CFX_PathData* pPathData, const CFX_AffineMatrix* pObject2Device);
 };
 
 void CSkia_PathData::BuildPath(const CFX_PathData* pPathData, const CFX_AffineMatrix* pObject2Device)
@@ skipping 391 matching lines @@
         CFX_SkiaDeviceDriver* pDriver =  FX_NEW CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
         SetDeviceDriver(pDriver);
         return TRUE;
 }
 CFX_SkiaDevice::~CFX_SkiaDevice()
 {
         if (m_bOwnedBitmap && GetBitmap()) delete GetBitmap();
 }
 
 #endif