Rework CFX_CountRef in terms of CFX_RetainPtr

core/fxge/include/fx_dib.h

 // 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
 
 #ifndef CORE_FXGE_INCLUDE_FX_DIB_H_
 #define CORE_FXGE_INCLUDE_FX_DIB_H_
 
 #include <memory>
 #include <vector>
 
+#include "core/fxcrt/include/cfx_count_ref.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 
 enum FXDIB_Format {
   FXDIB_Invalid = 0,
   FXDIB_1bppMask = 0x101,
   FXDIB_1bppRgb = 0x001,
   FXDIB_1bppCmyk = 0x401,
   FXDIB_8bppMask = 0x108,
   FXDIB_8bppRgb = 0x008,
@@ skipping 359 matching lines @@
   explicit CFX_DIBExtractor(const CFX_DIBSource* pSrc);
   ~CFX_DIBExtractor();
 
   CFX_DIBitmap* GetBitmap() { return m_pBitmap.get(); }
 
  private:
   std::unique_ptr<CFX_DIBitmap> m_pBitmap;
 };
 
 typedef CFX_CountRef<CFX_DIBitmap> CFX_DIBitmapRef;
+
 class CFX_FilteredDIB : public CFX_DIBSource {
  public:
   CFX_FilteredDIB();
   ~CFX_FilteredDIB() override;
 
   void LoadSrc(const CFX_DIBSource* pSrc, FX_BOOL bAutoDropSrc = FALSE);
 
   virtual FXDIB_Format GetDestFormat() = 0;
 
   virtual uint32_t* GetDestPalette() = 0;
@@ skipping 267 matching lines @@
   int m_Status;
   FX_RECT m_ClipBox;
   uint32_t m_Flags;
   int m_AlphaFlag;
   void* m_pIccTransform;
   FX_BOOL m_bRgbByteOrder;
   int m_BlendType;
 };
 
 #endif  // CORE_FXGE_INCLUDE_FX_DIB_H_