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/fxge | |
| 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/fxge')
| -rw-r--r-- | core/fxge/dib/cfx_dibitmap.h | 4 | ||||
| -rw-r--r-- | core/fxge/win32/cfx_psrenderer.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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<uint8_t, FxFreeDeleter> m_pBuffer; + MaybeOwned<uint8_t, FxFreeDeleter> m_pBuffer; #if defined _SKIA_SUPPORT_PATHS_ Format m_nFormat; #endif diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp index 651088602e..7e21b25411 100644 --- a/core/fxge/win32/cfx_psrenderer.cpp +++ b/core/fxge/win32/cfx_psrenderer.cpp @@ -15,7 +15,7 @@ #include "core/fxcodec/codec/ccodec_flatemodule.h" #include "core/fxcodec/codec/ccodec_jpegmodule.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/cfx_maybe_owned.h" +#include "core/fxcrt/maybe_owned.h" #include "core/fxge/cfx_facecache.h" #include "core/fxge/cfx_fontcache.h" #include "core/fxge/cfx_gemodule.h" diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index ca5195fb5a..ac13266444 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -10,10 +10,10 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/maybe_owned.h" #include "core/fxge/cfx_folderfontinfo.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_windowsrenderdevice.h" |