diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 16:51:15 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 16:51:15 -0700 |
| commit | 6f0a64a1bf18ab6636404cdfb883897459083a4d (patch) | |
| tree | 1ef1326c8bb015213e0cdf0d726a27a537d09c73 /core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | |
| parent | e4503ea9947d2f9c61704da20271b413a364a9c0 (diff) | |
| download | pdfium-6f0a64a1bf18ab6636404cdfb883897459083a4d.tar.xz | |
Remove FX_BSTR and FX_WSTR typedefs.chromium/2434chromium/2433chromium/2432chromium/2431chromium/2430
These stand for const CFX_{Byte,Wide}StringC&, which is just
monumentally confusing, since there are so many string types
running around here.
The following had manual changes:
core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp
core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
core/src/fpdfdoc/doc_form.cpp
fpdfsdk/src/fpdf_ext.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1180593004.
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index 3ce4baf20c..8752acf536 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -376,7 +376,7 @@ CPDF_GeneralStateData::~CPDF_GeneralStateData() pDocCache->ReleaseTransferFunc(m_pTR); } } -static int GetBlendType(FX_BSTR mode) +static int GetBlendType(const CFX_ByteStringC& mode) { switch (mode.GetID()) { case FXBSTR_ID('N', 'o', 'r', 'm'): @@ -417,7 +417,7 @@ static int GetBlendType(FX_BSTR mode) } return FXDIB_BLEND_NORMAL; } -void CPDF_GeneralStateData::SetBlendMode(FX_BSTR blend_mode) +void CPDF_GeneralStateData::SetBlendMode(const CFX_ByteStringC& blend_mode) { if (blend_mode.GetLength() > 15) { return; @@ -677,7 +677,7 @@ void CPDF_ContentMarkData::DeleteLastMark() } m_Marks.RemoveAt(size - 1); } -FX_BOOL CPDF_ContentMark::HasMark(FX_BSTR mark) const +FX_BOOL CPDF_ContentMark::HasMark(const CFX_ByteStringC& mark) const { if (m_pObject == NULL) { return FALSE; @@ -690,7 +690,7 @@ FX_BOOL CPDF_ContentMark::HasMark(FX_BSTR mark) const } return FALSE; } -FX_BOOL CPDF_ContentMark::LookupMark(FX_BSTR mark, CPDF_Dictionary*& pDict) const +FX_BOOL CPDF_ContentMark::LookupMark(const CFX_ByteStringC& mark, CPDF_Dictionary*& pDict) const { if (m_pObject == NULL) { return FALSE; |