From de44d154f6c61af75f149e965a7f483f0b30dd98 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 14:52:41 -0400 Subject: 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 Reviewed-by: Tom Sepez --- core/fxge/dib/cfx_dibitmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fxge/dib') diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h index fb676691ef..79eeaeb273 100644 --- a/core/fxge/dib/cfx_dibitmap.h +++ b/core/fxge/dib/cfx_dibitmap.h @@ -7,9 +7,9 @@ #ifndef CORE_FXGE_DIB_CFX_DIBITMAP_H_ #define CORE_FXGE_DIB_CFX_DIBITMAP_H_ -#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/maybe_owned.h" #include "core/fxge/dib/cfx_dibsource.h" #include "third_party/base/stl_util.h" @@ -116,7 +116,7 @@ class CFX_DIBitmap : public CFX_DIBSource { enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied }; #endif - CFX_MaybeOwned m_pBuffer; + MaybeOwned m_pBuffer; #if defined _SKIA_SUPPORT_PATHS_ Format m_nFormat; #endif -- cgit v1.2.3