diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 16:53:58 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:25:26 +0000 |
| commit | aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch) | |
| tree | 1e14d60adcffeb0791a0a6c8792d3e9c0109384e /core/fxcodec/jbig2 | |
| parent | 8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff) | |
| download | pdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz | |
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>
Diffstat (limited to 'core/fxcodec/jbig2')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_ArithDecoder.h | 4 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_GrdProc.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_HuffmanDecoder.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.h b/core/fxcodec/jbig2/JBig2_ArithDecoder.h index 2ec64fe954..d4a2daedbc 100644 --- a/core/fxcodec/jbig2/JBig2_ArithDecoder.h +++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CJBig2_BitStream; @@ -39,7 +39,7 @@ class CJBig2_ArithDecoder { unsigned int m_C; unsigned int m_A; unsigned int m_CT; - CFX_UnownedPtr<CJBig2_BitStream> const m_pStream; + UnownedPtr<CJBig2_BitStream> const m_pStream; }; #endif // CORE_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_ diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h index 14c57f976a..79992adcba 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.h +++ b/core/fxcodec/jbig2/JBig2_GrdProc.h @@ -10,9 +10,9 @@ #include <memory> #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CJBig2_ArithDecoder; class CJBig2_BitStream; diff --git a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h index 15ebf7827d..ac53b4d9c0 100644 --- a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h +++ b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h @@ -9,7 +9,7 @@ #include "core/fxcodec/jbig2/JBig2_BitStream.h" #include "core/fxcodec/jbig2/JBig2_HuffmanTable.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CJBig2_HuffmanDecoder { public: @@ -20,7 +20,7 @@ class CJBig2_HuffmanDecoder { int decodeAValue(CJBig2_HuffmanTable* pTable, int* nResult); private: - CFX_UnownedPtr<CJBig2_BitStream> const m_pStream; + UnownedPtr<CJBig2_BitStream> const m_pStream; }; #endif // CORE_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_ |