diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-08-13 23:19:29 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-13 23:19:29 +0000 |
| commit | ed176992eb7ddbb0fee7b79625501df06f8ccf93 (patch) | |
| tree | ab5493b058e80da342648fda8b0cc8a8ba6cab94 /xfa/fxfa/parser | |
| parent | f0260b2cccb9e6c59413a20040dccf5551fb6882 (diff) | |
| download | pdfium-ed176992eb7ddbb0fee7b79625501df06f8ccf93.tar.xz | |
Make CFX_ReadOnlyMemoryStream take a span.
Change-Id: Id097320ab2d9b5d1579582e5797e29c701499501
Reviewed-on: https://pdfium-review.googlesource.com/39991
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document_parser.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 9 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_xmllocale.cpp | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index 5cb08863c8..d0f137da7c 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -332,8 +332,8 @@ bool CXFA_DocumentParser::Parse( } CFX_XMLNode* CXFA_DocumentParser::ParseXMLData(const ByteString& wsXML) { - auto pStream = pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>( - wsXML.raw_str(), wsXML.GetLength()); + auto pStream = + pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(wsXML.AsRawSpan()); xml_doc_ = LoadXML(pStream); if (!xml_doc_) return nullptr; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 06bbb0936a..a60e66584b 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -29,6 +29,7 @@ #include "third_party/base/compiler_specific.h" #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/span.h" #include "third_party/base/stl_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fgas/font/cfgas_fontmgr.h" @@ -199,7 +200,6 @@ RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, return nullptr; FXCODEC_IMAGE_TYPE type = XFA_GetImageType(pImage->GetContentType()); - ByteString bsContent; std::vector<uint8_t> buffer; RetainPtr<IFX_SeekableReadStream> pImageFileRead; if (wsImage.GetLength() > 0) { @@ -209,13 +209,12 @@ RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, buffer.resize(bsData.GetLength()); int32_t iRead = XFA_Base64Decode(bsData.c_str(), buffer.data()); if (iRead > 0) { - pImageFileRead = - pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(buffer.data(), iRead); + pImageFileRead = pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>( + pdfium::make_span(buffer.data(), iRead)); } } else { - bsContent = wsImage.ToDefANSI(); pImageFileRead = pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>( - bsContent.raw_str(), bsContent.GetLength()); + wsImage.ToDefANSI().AsRawSpan()); } } else { WideString wsURL = wsHref; diff --git a/xfa/fxfa/parser/cxfa_xmllocale.cpp b/xfa/fxfa/parser/cxfa_xmllocale.cpp index 2806a084d6..20557dd59c 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.cpp +++ b/xfa/fxfa/parser/cxfa_xmllocale.cpp @@ -31,8 +31,7 @@ constexpr wchar_t kCurrencySymbol[] = L"currencySymbol"; // static std::unique_ptr<CXFA_XMLLocale> CXFA_XMLLocale::Create( pdfium::span<uint8_t> data) { - auto stream = - pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(data.data(), data.size()); + auto stream = pdfium::MakeRetain<CFX_ReadOnlyMemoryStream>(data); CFX_XMLParser parser(stream); auto doc = parser.Parse(); if (!doc) |