diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 14:52:41 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 19:22:00 +0000 |
| commit | de44d154f6c61af75f149e965a7f483f0b30dd98 (patch) | |
| tree | cb33c824a73bb017d4403fba898b1d8c4e0c1566 /core/fpdfapi/page | |
| parent | b89669975f6156fce4ced5c8998125a845f8e7dc (diff) | |
| download | pdfium-de44d154f6c61af75f149e965a7f483f0b30dd98.tar.xz | |
Move CFX_MaybeOwned to fxcrt::MaybeOwned
This CL moves CFX_MaybeOwned into the fxcrt namespace and removes the
CFX_ prefix.
The test names for maybe owned were updated to be in the MaybeOned test
suite instead of the fxcrt suite.
Bug: pdfium:898
Change-Id: I0c07057d66c8610e7b19133094b4507fff725e76
Reviewed-on: https://pdfium-review.googlesource.com/14470
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_colorspace.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp index 3e2b885ee5..5455d4dbba 100644 --- a/core/fpdfapi/page/cpdf_colorspace.cpp +++ b/core/fpdfapi/page/cpdf_colorspace.cpp @@ -31,8 +31,8 @@ #include "core/fxcodec/codec/ccodec_iccmodule.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/cfx_fixedbufgrow.h" -#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/maybe_owned.h" #include "third_party/base/stl_util.h" namespace { @@ -176,7 +176,7 @@ class CPDF_ICCBasedCS : public CPDF_ColorSpace { bool IsValidComponents(int32_t nComps) const; void PopulateRanges(CPDF_Dictionary* pDict); - CFX_MaybeOwned<CPDF_ColorSpace> m_pAlterCS; + MaybeOwned<CPDF_ColorSpace> m_pAlterCS; CFX_RetainPtr<CPDF_IccProfile> m_pProfile; uint8_t* m_pCache; float* m_pRanges; diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index ed32d4b36a..ddfd95ccf3 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -10,10 +10,10 @@ #include <memory> #include "core/fpdfapi/parser/cpdf_stream.h" -#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/maybe_owned.h" class CFX_DIBSource; class CFX_DIBitmap; @@ -80,8 +80,8 @@ class CPDF_Image : public CFX_Retainable { bool m_bIsMask = false; bool m_bInterpolate = false; CFX_UnownedPtr<CPDF_Document> const m_pDocument; - CFX_MaybeOwned<CPDF_Stream> m_pStream; - CFX_MaybeOwned<CPDF_Dictionary> m_pDict; + MaybeOwned<CPDF_Stream> m_pStream; + MaybeOwned<CPDF_Dictionary> m_pDict; CFX_UnownedPtr<CPDF_Dictionary> m_pOC; }; |