From b7973bb5a0ad2f83a71362d601a928964559004a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 17 Apr 2018 16:41:28 +0000 Subject: Reland "Return pdfium::span from WideString::GetBuffer()."" This reverts commit 0d32b8fda53e02c1036d39f7290d4f59f2b58ca4. Restore behaviour on trunk. TBR: dsinclair@chromium.org Change-Id: Ia867f09ae9d2885595c4d9b300a058431dfd84f2 Reviewed-on: https://pdfium-review.googlesource.com/30811 Reviewed-by: Tom Sepez Commit-Queue: Tom Sepez --- core/fxcrt/widestring_unittest.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'core/fxcrt/widestring_unittest.cpp') diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp index 48d5c7f8f5..ec0a55fc1e 100644 --- a/core/fxcrt/widestring_unittest.cpp +++ b/core/fxcrt/widestring_unittest.cpp @@ -817,20 +817,21 @@ TEST(WideString, Reserve) { } TEST(WideString, GetBuffer) { + WideString str1; { - WideString str; - wchar_t* buffer = str.GetBuffer(12); - wcscpy(buffer, L"clams"); - str.ReleaseBuffer(str.GetStringLength()); - EXPECT_EQ(L"clams", str); + pdfium::span buffer = str1.GetBuffer(12); + wcscpy(buffer.data(), L"clams"); } + str1.ReleaseBuffer(str1.GetStringLength()); + EXPECT_EQ(L"clams", str1); + + WideString str2(L"cl"); { - WideString str(L"cl"); - wchar_t* buffer = str.GetBuffer(12); - wcscpy(buffer + 2, L"ams"); - str.ReleaseBuffer(str.GetStringLength()); - EXPECT_EQ(L"clams", str); + pdfium::span buffer = str2.GetBuffer(12); + wcscpy(buffer.data() + 2, L"ams"); } + str2.ReleaseBuffer(str2.GetStringLength()); + EXPECT_EQ(L"clams", str2); } TEST(WideString, ReleaseBuffer) { -- cgit v1.2.3