From aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 21 Sep 2017 16:53:58 -0400
Subject: Move CFX_UnownedPtr to UnownedPtr

This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt
namespace.

Bug: pdfium:898
Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0
Reviewed-on: https://pdfium-review.googlesource.com/14620
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 core/fpdfapi/render/cpdf_devicebuffer.h        |  8 ++++----
 core/fpdfapi/render/cpdf_dibsource.h           | 10 +++++-----
 core/fpdfapi/render/cpdf_docrenderdata.h       |  4 ++--
 core/fpdfapi/render/cpdf_imagecacheentry.h     |  4 ++--
 core/fpdfapi/render/cpdf_imageloader.h         |  6 +++---
 core/fpdfapi/render/cpdf_imagerenderer.h       | 10 +++++-----
 core/fpdfapi/render/cpdf_pagerendercache.h     |  4 ++--
 core/fpdfapi/render/cpdf_progressiverenderer.h |  4 ++--
 core/fpdfapi/render/cpdf_rendercontext.h       | 10 +++++-----
 core/fpdfapi/render/cpdf_renderstatus.cpp      |  2 +-
 core/fpdfapi/render/cpdf_renderstatus.h        | 10 +++++-----
 core/fpdfapi/render/cpdf_scaledrenderbuffer.h  |  8 ++++----
 core/fpdfapi/render/cpdf_transferfunc.h        |  4 ++--
 core/fpdfapi/render/cpdf_type3cache.h          |  2 +-
 14 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'core/fpdfapi/render')

diff --git a/core/fpdfapi/render/cpdf_devicebuffer.h b/core/fpdfapi/render/cpdf_devicebuffer.h
index 2146c9761f..854906e03c 100644
--- a/core/fpdfapi/render/cpdf_devicebuffer.h
+++ b/core/fpdfapi/render/cpdf_devicebuffer.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CFX_DIBitmap;
 class CFX_RenderDevice;
@@ -33,9 +33,9 @@ class CPDF_DeviceBuffer {
   const CFX_Matrix* GetMatrix() const { return &m_Matrix; }
 
  private:
-  CFX_UnownedPtr<CFX_RenderDevice> m_pDevice;
-  CFX_UnownedPtr<CPDF_RenderContext> m_pContext;
-  CFX_UnownedPtr<const CPDF_PageObject> m_pObject;
+  UnownedPtr<CFX_RenderDevice> m_pDevice;
+  UnownedPtr<CPDF_RenderContext> m_pContext;
+  UnownedPtr<const CPDF_PageObject> m_pObject;
   RetainPtr<CFX_DIBitmap> m_pBitmap;
   FX_RECT m_Rect;
   CFX_Matrix m_Matrix;
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h
index 08c4afe862..dd7dd4fc02 100644
--- a/core/fpdfapi/render/cpdf_dibsource.h
+++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -18,8 +18,8 @@
 #include "core/fpdfapi/render/cpdf_imageloader.h"
 #include "core/fpdfapi/render/cpdf_rendercontext.h"
 #include "core/fpdfapi/render/cpdf_renderoptions.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_renderdevice.h"
 
@@ -122,9 +122,9 @@ class CPDF_DIBSource : public CFX_DIBSource {
                                int clip_width) const;
   bool TransMask() const;
 
-  CFX_UnownedPtr<CPDF_Document> m_pDocument;
-  CFX_UnownedPtr<const CPDF_Stream> m_pStream;
-  CFX_UnownedPtr<const CPDF_Dictionary> m_pDict;
+  UnownedPtr<CPDF_Document> m_pDocument;
+  UnownedPtr<const CPDF_Stream> m_pStream;
+  UnownedPtr<const CPDF_Dictionary> m_pDict;
   RetainPtr<CPDF_StreamAcc> m_pStreamAcc;
   CPDF_ColorSpace* m_pColorSpace;
   uint32_t m_Family;
@@ -148,7 +148,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
   RetainPtr<CPDF_StreamAcc> m_pGlobalStream;
   std::unique_ptr<CCodec_ScanlineDecoder> m_pDecoder;
   std::unique_ptr<CCodec_Jbig2Context> m_pJbig2Context;
-  CFX_UnownedPtr<CPDF_Stream> m_pMaskStream;
+  UnownedPtr<CPDF_Stream> m_pMaskStream;
   int m_Status;
 };
 
diff --git a/core/fpdfapi/render/cpdf_docrenderdata.h b/core/fpdfapi/render/cpdf_docrenderdata.h
index efc4741e5e..7b3e0ed398 100644
--- a/core/fpdfapi/render/cpdf_docrenderdata.h
+++ b/core/fpdfapi/render/cpdf_docrenderdata.h
@@ -11,8 +11,8 @@
 
 #include "core/fpdfapi/page/cpdf_countedobject.h"
 #include "core/fpdfapi/render/cpdf_transferfunc.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CPDF_Document;
 class CPDF_Font;
@@ -34,7 +34,7 @@ class CPDF_DocRenderData {
   void Clear(bool bRelease);
 
  private:
-  CFX_UnownedPtr<CPDF_Document> m_pPDFDoc;
+  UnownedPtr<CPDF_Document> m_pPDFDoc;
   std::map<CPDF_Font*, RetainPtr<CPDF_Type3Cache>> m_Type3FaceMap;
   std::map<CPDF_Object*, RetainPtr<CPDF_TransferFunc>> m_TransferFuncMap;
 };
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h
index 111050f60c..2bede23e62 100644
--- a/core/fpdfapi/render/cpdf_imagecacheentry.h
+++ b/core/fpdfapi/render/cpdf_imagecacheentry.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CFX_DIBSource;
 class CFX_DIBitmap;
@@ -48,7 +48,7 @@ class CPDF_ImageCacheEntry {
   void ContinueGetCachedBitmap(CPDF_RenderStatus* pRenderStatus);
   void CalcSize();
 
-  CFX_UnownedPtr<CPDF_Document> const m_pDocument;
+  UnownedPtr<CPDF_Document> const m_pDocument;
   RetainPtr<CPDF_Image> const m_pImage;
   RetainPtr<CFX_DIBSource> m_pCurBitmap;
   RetainPtr<CFX_DIBSource> m_pCurMask;
diff --git a/core/fpdfapi/render/cpdf_imageloader.h b/core/fpdfapi/render/cpdf_imageloader.h
index 2fc0670dff..497ef156da 100644
--- a/core/fpdfapi/render/cpdf_imageloader.h
+++ b/core/fpdfapi/render/cpdf_imageloader.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
 
 class CPDF_ImageObject;
@@ -39,8 +39,8 @@ class CPDF_ImageLoader {
  private:
   void HandleFailure();
 
-  CFX_UnownedPtr<CPDF_PageRenderCache> m_pCache;
-  CFX_UnownedPtr<CPDF_ImageObject> m_pImageObject;
+  UnownedPtr<CPDF_PageRenderCache> m_pCache;
+  UnownedPtr<CPDF_ImageObject> m_pImageObject;
 };
 
 #endif  // CORE_FPDFAPI_RENDER_CPDF_IMAGELOADER_H_
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index 0d59a4e7cb..ba61ab4493 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h
@@ -10,8 +10,8 @@
 #include <memory>
 
 #include "core/fpdfapi/render/cpdf_imageloader.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/dib/cfx_imagerenderer.h"
 
 class CFX_DIBitmap;
@@ -63,17 +63,17 @@ class CPDF_ImageRenderer {
                           const FX_RECT& rect) const;
   void HandleFilters();
 
-  CFX_UnownedPtr<CPDF_RenderStatus> m_pRenderStatus;
-  CFX_UnownedPtr<CPDF_ImageObject> m_pImageObject;
+  UnownedPtr<CPDF_RenderStatus> m_pRenderStatus;
+  UnownedPtr<CPDF_ImageObject> m_pImageObject;
   int m_Status;
-  CFX_UnownedPtr<const CFX_Matrix> m_pObj2Device;
+  UnownedPtr<const CFX_Matrix> m_pObj2Device;
   CFX_Matrix m_ImageMatrix;
   CPDF_ImageLoader m_Loader;
   RetainPtr<CFX_DIBSource> m_pDIBSource;
   RetainPtr<CFX_DIBitmap> m_pClone;
   int m_BitmapAlpha;
   bool m_bPatternColor;
-  CFX_UnownedPtr<CPDF_Pattern> m_pPattern;
+  UnownedPtr<CPDF_Pattern> m_pPattern;
   FX_ARGB m_FillArgb;
   uint32_t m_Flags;
   std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
diff --git a/core/fpdfapi/render/cpdf_pagerendercache.h b/core/fpdfapi/render/cpdf_pagerendercache.h
index 76898ab258..58f0bb7e32 100644
--- a/core/fpdfapi/render/cpdf_pagerendercache.h
+++ b/core/fpdfapi/render/cpdf_pagerendercache.h
@@ -9,9 +9,9 @@
 
 #include <map>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CFX_DIBitmap;
 class CPDF_Image;
@@ -46,7 +46,7 @@ class CPDF_PageRenderCache {
  private:
   void ClearImageCacheEntry(CPDF_Stream* pStream);
 
-  CFX_UnownedPtr<CPDF_Page> const m_pPage;
+  UnownedPtr<CPDF_Page> const m_pPage;
   CPDF_ImageCacheEntry* m_pCurImageCacheEntry;
   std::map<CPDF_Stream*, CPDF_ImageCacheEntry*> m_ImageCache;
   uint32_t m_nTimeCount;
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.h b/core/fpdfapi/render/cpdf_progressiverenderer.h
index 195636f168..ffd63a9aaf 100644
--- a/core/fpdfapi/render/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/render/cpdf_progressiverenderer.h
@@ -47,8 +47,8 @@ class CPDF_ProgressiveRenderer {
   static const int kStepLimit = 100;
 
   Status m_Status;
-  CFX_UnownedPtr<CPDF_RenderContext> const m_pContext;
-  CFX_UnownedPtr<CFX_RenderDevice> const m_pDevice;
+  UnownedPtr<CPDF_RenderContext> const m_pContext;
+  UnownedPtr<CFX_RenderDevice> const m_pDevice;
   const CPDF_RenderOptions* const m_pOptions;
   std::unique_ptr<CPDF_RenderStatus> m_pRenderStatus;
   CFX_FloatRect m_ClipRect;
diff --git a/core/fpdfapi/render/cpdf_rendercontext.h b/core/fpdfapi/render/cpdf_rendercontext.h
index 8806a78622..606e5b9b68 100644
--- a/core/fpdfapi/render/cpdf_rendercontext.h
+++ b/core/fpdfapi/render/cpdf_rendercontext.h
@@ -9,9 +9,9 @@
 
 #include <vector>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CPDF_Dictionary;
 class CPDF_Document;
@@ -32,7 +32,7 @@ class CPDF_RenderContext {
     Layer(const Layer& that);
     ~Layer();
 
-    CFX_UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder;
+    UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder;
     CFX_Matrix m_Matrix;
   };
 
@@ -65,9 +65,9 @@ class CPDF_RenderContext {
   CPDF_PageRenderCache* GetPageCache() const { return m_pPageCache.Get(); }
 
  protected:
-  CFX_UnownedPtr<CPDF_Document> const m_pDocument;
-  CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources;
-  CFX_UnownedPtr<CPDF_PageRenderCache> m_pPageCache;
+  UnownedPtr<CPDF_Document> const m_pDocument;
+  UnownedPtr<CPDF_Dictionary> m_pPageResources;
+  UnownedPtr<CPDF_PageRenderCache> m_pPageCache;
   std::vector<Layer> m_Layers;
 };
 
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index e94913d9aa..8cc91e470d 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -87,7 +87,7 @@ class CPDF_RefType3Cache {
   }
 
   uint32_t m_dwCount;
-  CFX_UnownedPtr<CPDF_Type3Font> const m_pType3Font;
+  UnownedPtr<CPDF_Type3Font> const m_pType3Font;
 };
 
 uint32_t CountOutputs(
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index b823834e7d..def3702e68 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -13,7 +13,7 @@
 #include "core/fpdfapi/page/cpdf_clippath.h"
 #include "core/fpdfapi/page/cpdf_graphicstates.h"
 #include "core/fpdfapi/render/cpdf_renderoptions.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_renderdevice.h"
 
 class CFX_PathData;
@@ -71,8 +71,8 @@ class CPDF_RenderStatus {
 #endif
 
   CPDF_RenderOptions m_Options;
-  CFX_UnownedPtr<CPDF_Dictionary> m_pFormResource;
-  CFX_UnownedPtr<CPDF_Dictionary> m_pPageResource;
+  UnownedPtr<CPDF_Dictionary> m_pFormResource;
+  UnownedPtr<CPDF_Dictionary> m_pPageResource;
   std::vector<CPDF_Type3Font*> m_Type3FontCache;
 
  private:
@@ -159,7 +159,7 @@ class CPDF_RenderStatus {
   static const int kRenderMaxRecursionDepth = 64;
   static int s_CurrentRecursionDepth;
 
-  CFX_UnownedPtr<CPDF_RenderContext> m_pContext;
+  UnownedPtr<CPDF_RenderContext> m_pContext;
   bool m_bStopped;
   CFX_RenderDevice* m_pDevice;
   CFX_Matrix m_DeviceMatrix;
@@ -174,7 +174,7 @@ class CPDF_RenderStatus {
   bool m_bStdCS;
   uint32_t m_GroupFamily;
   bool m_bLoadMask;
-  CFX_UnownedPtr<CPDF_Type3Char> m_pType3Char;
+  UnownedPtr<CPDF_Type3Char> m_pType3Char;
   FX_ARGB m_T3FillColor;
   int m_curBlend;
 };
diff --git a/core/fpdfapi/render/cpdf_scaledrenderbuffer.h b/core/fpdfapi/render/cpdf_scaledrenderbuffer.h
index 47ab5ad39f..b77e4b6309 100644
--- a/core/fpdfapi/render/cpdf_scaledrenderbuffer.h
+++ b/core/fpdfapi/render/cpdf_scaledrenderbuffer.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 
 class CFX_RenderDevice;
@@ -37,10 +37,10 @@ class CPDF_ScaledRenderBuffer {
   void OutputToDevice();
 
  private:
-  CFX_UnownedPtr<CFX_RenderDevice> m_pDevice;
-  CFX_UnownedPtr<CPDF_RenderContext> m_pContext;
+  UnownedPtr<CFX_RenderDevice> m_pDevice;
+  UnownedPtr<CPDF_RenderContext> m_pContext;
   FX_RECT m_Rect;
-  CFX_UnownedPtr<const CPDF_PageObject> m_pObject;
+  UnownedPtr<const CPDF_PageObject> m_pObject;
   std::unique_ptr<CFX_DefaultRenderDevice> m_pBitmapDevice;
   CFX_Matrix m_Matrix;
 };
diff --git a/core/fpdfapi/render/cpdf_transferfunc.h b/core/fpdfapi/render/cpdf_transferfunc.h
index 32811891ea..40f83ea9a9 100644
--- a/core/fpdfapi/render/cpdf_transferfunc.h
+++ b/core/fpdfapi/render/cpdf_transferfunc.h
@@ -7,8 +7,8 @@
 #ifndef CORE_FPDFAPI_RENDER_CPDF_TRANSFERFUNC_H_
 #define CORE_FPDFAPI_RENDER_CPDF_TRANSFERFUNC_H_
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
 
 class CPDF_Document;
@@ -22,7 +22,7 @@ class CPDF_TransferFunc : public Retainable {
   FX_COLORREF TranslateColor(FX_COLORREF src) const;
   RetainPtr<CFX_DIBSource> TranslateImage(const RetainPtr<CFX_DIBSource>& pSrc);
 
-  CFX_UnownedPtr<CPDF_Document> const m_pPDFDoc;
+  UnownedPtr<CPDF_Document> const m_pPDFDoc;
   bool m_bIdentity;
   uint8_t m_Samples[256 * 3];
 
diff --git a/core/fpdfapi/render/cpdf_type3cache.h b/core/fpdfapi/render/cpdf_type3cache.h
index fe681bbc99..7911785ab1 100644
--- a/core/fpdfapi/render/cpdf_type3cache.h
+++ b/core/fpdfapi/render/cpdf_type3cache.h
@@ -38,7 +38,7 @@ class CPDF_Type3Cache : public Retainable {
                                                float retinaScaleX,
                                                float retinaScaleY);
 
-  CFX_UnownedPtr<CPDF_Type3Font> const m_pFont;
+  UnownedPtr<CPDF_Type3Font> const m_pFont;
   std::map<ByteString, std::unique_ptr<CPDF_Type3Glyphs>> m_SizeMap;
 };
 
-- 
cgit v1.2.3