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/fpdftext/cpdf_linkextract.h  |  2 +-
 core/fpdftext/cpdf_textpage.h     | 12 ++++++------
 core/fpdftext/cpdf_textpagefind.h |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'core/fpdftext')

diff --git a/core/fpdftext/cpdf_linkextract.h b/core/fpdftext/cpdf_linkextract.h
index db82deb684..713f658169 100644
--- a/core/fpdftext/cpdf_linkextract.h
+++ b/core/fpdftext/cpdf_linkextract.h
@@ -37,7 +37,7 @@ class CPDF_LinkExtract {
     WideString m_strUrl;
   };
 
-  CFX_UnownedPtr<const CPDF_TextPage> const m_pTextPage;
+  UnownedPtr<const CPDF_TextPage> const m_pTextPage;
   WideString m_strPageText;
   std::vector<Link> m_LinkArray;
 };
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index ef55ad05cb..155f991a91 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -11,10 +11,10 @@
 #include <vector>
 
 #include "core/fpdfapi/page/cpdf_pageobjectlist.h"
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/cfx_widetextbuf.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
+#include "core/fxcrt/unowned_ptr.h"
 
 class CPDF_Font;
 class CPDF_FormObject;
@@ -58,7 +58,7 @@ class FPDF_CHAR_INFO {
   float m_FontSize;
   CFX_PointF m_Origin;
   CFX_FloatRect m_CharBox;
-  CFX_UnownedPtr<CPDF_TextObject> m_pTextObj;
+  UnownedPtr<CPDF_TextObject> m_pTextObj;
   CFX_Matrix m_Matrix;
 };
 
@@ -79,7 +79,7 @@ class PAGECHAR_INFO {
   int32_t m_Flag;
   CFX_PointF m_Origin;
   CFX_FloatRect m_CharBox;
-  CFX_UnownedPtr<CPDF_TextObject> m_pTextObj;
+  UnownedPtr<CPDF_TextObject> m_pTextObj;
   CFX_Matrix m_Matrix;
 };
 
@@ -88,7 +88,7 @@ struct PDFTEXT_Obj {
   PDFTEXT_Obj(const PDFTEXT_Obj& that);
   ~PDFTEXT_Obj();
 
-  CFX_UnownedPtr<CPDF_TextObject> m_pTextObj;
+  UnownedPtr<CPDF_TextObject> m_pTextObj;
   CFX_Matrix m_formMatrix;
 };
 
@@ -167,14 +167,14 @@ class CPDF_TextPage {
                      const CPDF_Font* pFont,
                      int nItems) const;
 
-  CFX_UnownedPtr<const CPDF_Page> const m_pPage;
+  UnownedPtr<const CPDF_Page> const m_pPage;
   std::vector<uint16_t> m_CharIndex;
   std::deque<PAGECHAR_INFO> m_CharList;
   std::deque<PAGECHAR_INFO> m_TempCharList;
   CFX_WideTextBuf m_TextBuf;
   CFX_WideTextBuf m_TempTextBuf;
   const FPDFText_Direction m_parserflag;
-  CFX_UnownedPtr<CPDF_TextObject> m_pPreTextObj;
+  UnownedPtr<CPDF_TextObject> m_pPreTextObj;
   CFX_Matrix m_perMatrix;
   bool m_bIsParsed;
   CFX_Matrix m_DisplayMatrix;
diff --git a/core/fpdftext/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h
index f9a28a0b0a..face4e46b4 100644
--- a/core/fpdftext/cpdf_textpagefind.h
+++ b/core/fpdftext/cpdf_textpagefind.h
@@ -9,10 +9,10 @@
 
 #include <vector>
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "third_party/base/optional.h"
 
 class CPDF_TextPage;
@@ -43,7 +43,7 @@ class CPDF_TextPageFind {
 
  private:
   std::vector<uint16_t> m_CharIndex;
-  CFX_UnownedPtr<const CPDF_TextPage> m_pTextPage;
+  UnownedPtr<const CPDF_TextPage> m_pTextPage;
   WideString m_strText;
   WideString m_findWhat;
   int m_flags;
-- 
cgit v1.2.3