Merge to XFA: Kill CFX_Object.

core/src/fxge/win32/fx_win32_dwrite.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.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
 #include "../../../include/fxge/fx_ge_win32.h"
 #include "dwrite_int.h"
 #include <dwrite.h>
 typedef HRESULT  (__stdcall *FuncType_DWriteCreateFactory)(__in DWRITE_FACTORY_TYPE, __in REFIID, __out IUnknown **);
 template <typename InterfaceType>
 inline void SafeRelease(InterfaceType** currentObject)
 {
     if (*currentObject != NULL) {
         (*currentObject)->Release();
         *currentObject = NULL;
     }
 }
 template <typename InterfaceType>
 inline InterfaceType* SafeAcquire(InterfaceType* newObject)
 {
     if (newObject != NULL) {
         newObject->AddRef();
     }
     return newObject;
 }
-class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object
+class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream
 {
 public:
     explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize);
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject);
     virtual ULONG   STDMETHODCALLTYPE AddRef();
     virtual ULONG   STDMETHODCALLTYPE Release();
     virtual HRESULT STDMETHODCALLTYPE ReadFileFragment(void const** fragmentStart, UINT64 fileOffset, UINT64 fragmentSize, OUT void** fragmentContext);
     virtual void    STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext);
     virtual HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize);
     virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64* lastWriteTime);
     bool IsInitialized()
     {
         return resourcePtr_ != NULL;
     }
 private:
     ULONG refCount_;
     void const* resourcePtr_;
     DWORD resourceSize_;
 };
-class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object
+class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader
 {
 public:
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject);
     virtual ULONG STDMETHODCALLTYPE AddRef();
     virtual ULONG STDMETHODCALLTYPE Release();
     virtual HRESULT STDMETHODCALLTYPE CreateStreamFromKey(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize, OUT IDWriteFontFileStream** fontFileStream);
 
     static IDWriteFontFileLoader* GetLoader()
     {
         if (instance_ == NULL) {
             instance_ = FX_NEW CDwFontFileLoader();
             return instance_;
         }
         return instance_;
     }
     static bool IsLoaderInitialized()
     {
         return instance_ != NULL;
     }
 private:
     CDwFontFileLoader();
     ULONG refCount_;
     static IDWriteFontFileLoader* instance_;
 };
-class CDwFontContext : public CFX_Object
+class CDwFontContext 
 {
 public:
     CDwFontContext(IDWriteFactory* dwriteFactory);
     ~CDwFontContext();
     HRESULT Initialize();
 private:
     CDwFontContext(CDwFontContext const&);
     void operator=(CDwFontContext const&);
     HRESULT hr_;
     IDWriteFactory* dwriteFactory_;
 };
-class CDwGdiTextRenderer : public CFX_Object
+class CDwGdiTextRenderer 
 {
 public:
     CDwGdiTextRenderer(
         CFX_DIBitmap* pBitmap,
         IDWriteBitmapRenderTarget* bitmapRenderTarget,
         IDWriteRenderingParams* renderingParams
     );
     CDwGdiTextRenderer::~CDwGdiTextRenderer();
     HRESULT STDMETHODCALLTYPE DrawGlyphRun(
         const FX_RECT& text_bbox,
@@ skipping 374 matching lines @@
         text_bbox.Height(),
         &dib,
         text_bbox.left,
         text_bbox.top,
         FXDIB_BLEND_NORMAL,
         pClipRgn
     );
     return hr;
 }
 #endif