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/page/cpdf_generalstate.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/fpdfapi/page/cpdf_generalstate.h')

diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h
index 8721a45268..5abb87ea26 100644
--- a/core/fpdfapi/page/cpdf_generalstate.h
+++ b/core/fpdfapi/page/cpdf_generalstate.h
@@ -7,10 +7,10 @@
 #ifndef CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
 #define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
 
-#include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/shared_copy_on_write.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
 
 class CPDF_Object;
@@ -85,11 +85,11 @@ class CPDF_GeneralState {
 
     ByteString m_BlendMode;
     int m_BlendType;
-    CFX_UnownedPtr<CPDF_Object> m_pSoftMask;
+    UnownedPtr<CPDF_Object> m_pSoftMask;
     CFX_Matrix m_SMaskMatrix;
     float m_StrokeAlpha;
     float m_FillAlpha;
-    CFX_UnownedPtr<CPDF_Object> m_pTR;
+    UnownedPtr<CPDF_Object> m_pTR;
     RetainPtr<CPDF_TransferFunc> m_pTransferFunc;
     CFX_Matrix m_Matrix;
     int m_RenderIntent;
@@ -99,9 +99,9 @@ class CPDF_GeneralState {
     bool m_StrokeOP;
     bool m_FillOP;
     int m_OPMode;
-    CFX_UnownedPtr<CPDF_Object> m_pBG;
-    CFX_UnownedPtr<CPDF_Object> m_pUCR;
-    CFX_UnownedPtr<CPDF_Object> m_pHT;
+    UnownedPtr<CPDF_Object> m_pBG;
+    UnownedPtr<CPDF_Object> m_pUCR;
+    UnownedPtr<CPDF_Object> m_pHT;
     float m_Flatness;
     float m_Smoothness;
   };
-- 
cgit v1.2.3