diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:49:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 20:17:31 +0000 |
| commit | 0b95042db2e6dab5876abd12ce485fff0a8e08fe (patch) | |
| tree | 02132ed53945fde30bfbf230ff4e9b5308dd7732 /xfa/fde/cfde_texteditengine.h | |
| parent | a5eb9f05b7c3f82630784e043ccf75c4e019b18f (diff) | |
| download | pdfium-0b95042db2e6dab5876abd12ce485fff0a8e08fe.tar.xz | |
Rename CFX_RetainPtr to RetainPtr
This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e
Reviewed-on: https://pdfium-review.googlesource.com/14616
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_texteditengine.h')
| -rw-r--r-- | xfa/fde/cfde_texteditengine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h index dbb12f3953..7b739be711 100644 --- a/xfa/fde/cfde_texteditengine.h +++ b/xfa/fde/cfde_texteditengine.h @@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/retain_ptr.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" #include "xfa/fgas/font/cfgas_gefont.h" @@ -96,8 +96,8 @@ class CFDE_TextEditEngine { CFX_RectF GetContentsBoundingBox(); void SetAvailableWidth(size_t width); - void SetFont(CFX_RetainPtr<CFGAS_GEFont> font); - CFX_RetainPtr<CFGAS_GEFont> GetFont() const { return font_; } + void SetFont(RetainPtr<CFGAS_GEFont> font); + RetainPtr<CFGAS_GEFont> GetFont() const { return font_; } void SetFontSize(float size); float GetFontSize() const { return font_size_; } void SetFontColor(FX_ARGB color) { font_color_ = color; } @@ -204,7 +204,7 @@ class CFDE_TextEditEngine { std::vector<FDE_TEXTEDITPIECE> text_piece_info_; std::vector<size_t> char_widths_; CFX_TxtBreak text_break_; - CFX_RetainPtr<CFGAS_GEFont> font_; + RetainPtr<CFGAS_GEFont> font_; FX_ARGB font_color_; float font_size_; float line_spacing_; |