diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-18 14:23:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-18 18:40:16 +0000 |
| commit | 275e260a6cd4a8e506ba974feb85ebcd926c1739 (patch) | |
| tree | 2029b9158ec044764ceff122fe5fb5d0a3f123d1 /core/fxcodec | |
| parent | 450fbeaaabf1ab340c1018de2e58f1950657517e (diff) | |
| download | pdfium-275e260a6cd4a8e506ba974feb85ebcd926c1739.tar.xz | |
Convert string class names
Automated using git grep & sed.
Replace StringC classes with StringView classes.
Remove the CFX_ prefix and put string classes in fxcrt namespace.
Change AsStringC() to AsStringView().
Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*,
Foo).
Couple of tests needed to have their names regularlized.
BUG=pdfium:894
Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d
Reviewed-on: https://pdfium-review.googlesource.com/14151
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcodec')
| -rw-r--r-- | core/fxcodec/codec/ccodec_gifmodule.cpp | 2 | ||||
| -rw-r--r-- | core/fxcodec/codec/ccodec_pngmodule.cpp | 4 | ||||
| -rw-r--r-- | core/fxcodec/fx_codec.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/lgif/cgifcontext.h | 2 | ||||
| -rw-r--r-- | core/fxcodec/lgif/fx_gif.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcodec/codec/ccodec_gifmodule.cpp b/core/fxcodec/codec/ccodec_gifmodule.cpp index 757019314d..f7e3546a8f 100644 --- a/core/fxcodec/codec/ccodec_gifmodule.cpp +++ b/core/fxcodec/codec/ccodec_gifmodule.cpp @@ -71,7 +71,7 @@ GifDecodeStatus CCodec_GifModule::LoadFrame(Context* pContext, if (len > 21) { uint8_t size = *buf++; if (size != 0) - pAttribute->m_strAuthor = CFX_ByteString(buf, size); + pAttribute->m_strAuthor = ByteString(buf, size); else pAttribute->m_strAuthor.clear(); } diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index 8a3de3a154..ae70389ced 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -86,8 +86,8 @@ static void _png_load_bmp_attribute(png_structp png_ptr, buf = "Author"; if (!memcmp(buf, text[i].key, std::min(len, FXSYS_strlen(buf)))) { pAttribute->m_strAuthor = - CFX_ByteString(reinterpret_cast<uint8_t*>(text[i].text), - static_cast<FX_STRSIZE>(text[i].text_length)); + ByteString(reinterpret_cast<uint8_t*>(text[i].text), + static_cast<FX_STRSIZE>(text[i].text_length)); } } } diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 2e83319ef7..926a884efe 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -48,7 +48,7 @@ class CFX_DIBAttribute { int32_t m_nYDPI; float m_fAspectRatio; uint16_t m_wDPIUnit; - CFX_ByteString m_strAuthor; + ByteString m_strAuthor; int32_t m_nGifLeft; int32_t m_nGifTop; uint32_t* m_pGifLocalPalette; diff --git a/core/fxcodec/lgif/cgifcontext.h b/core/fxcodec/lgif/cgifcontext.h index 1bd6d46d31..03976a7aad 100644 --- a/core/fxcodec/lgif/cgifcontext.h +++ b/core/fxcodec/lgif/cgifcontext.h @@ -46,7 +46,7 @@ class CGifContext : public CCodec_GifModule::Context { uint32_t avail_in; int32_t decode_status; uint32_t skip_size; - CFX_ByteString cmt_data; + ByteString cmt_data; std::unique_ptr<GifGCE> m_GifGCE; uint8_t* next_in; std::vector<std::unique_ptr<GifImage>> m_Images; diff --git a/core/fxcodec/lgif/fx_gif.cpp b/core/fxcodec/lgif/fx_gif.cpp index cef4f9a9a5..18385c3bdd 100644 --- a/core/fxcodec/lgif/fx_gif.cpp +++ b/core/fxcodec/lgif/fx_gif.cpp @@ -61,7 +61,7 @@ GifDecodeStatus gif_decode_extension(CGifContext* context) { context->skip_size = skip_size_org; return GifDecodeStatus::Unfinished; } - context->cmt_data += CFX_ByteString(data_ptr, data_size); + context->cmt_data += ByteString(data_ptr, data_size); } break; } |