From e09c1e4db92e28a332f55aa3c80ceb44f4b74287 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 11 Apr 2016 18:01:13 -0700 Subject: Make CFX_{Byte,Wide}String::Remove() no-touch if possible Don't try to copy the string until we are sure we need to change it. Review URL: https://codereview.chromium.org/1877993002 --- core/fxcrt/fx_basic_wstring_unittest.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'core/fxcrt/fx_basic_wstring_unittest.cpp') diff --git a/core/fxcrt/fx_basic_wstring_unittest.cpp b/core/fxcrt/fx_basic_wstring_unittest.cpp index bc38141a95..708556af1d 100644 --- a/core/fxcrt/fx_basic_wstring_unittest.cpp +++ b/core/fxcrt/fx_basic_wstring_unittest.cpp @@ -294,6 +294,35 @@ TEST(fxcrt, WideStringRemove) { EXPECT_EQ(L"", empty); } +TEST(fxcrt, WideStringRemoveCopies) { + CFX_WideString freed(L"FREED"); + const FX_WCHAR* old_buffer = freed.c_str(); + + // No change with single reference - no copy. + freed.Remove(L'Q'); + EXPECT_EQ(L"FREED", freed); + EXPECT_EQ(old_buffer, freed.c_str()); + + // Change with single reference - no copy. + freed.Remove(L'E'); + EXPECT_EQ(L"FRD", freed); + EXPECT_EQ(old_buffer, freed.c_str()); + + // No change with multiple references - no copy. + CFX_WideString shared(freed); + freed.Remove(L'Q'); + EXPECT_EQ(L"FRD", freed); + EXPECT_EQ(old_buffer, freed.c_str()); + EXPECT_EQ(old_buffer, shared.c_str()); + + // Change with multiple references -- must copy. + freed.Remove(L'D'); + EXPECT_EQ(L"FR", freed); + EXPECT_NE(old_buffer, freed.c_str()); + EXPECT_EQ(L"FRD", shared); + EXPECT_EQ(old_buffer, shared.c_str()); +} + TEST(fxcrt, WideStringReplace) { CFX_WideString fred(L"FRED"); fred.Replace(L"FR", L"BL"); -- cgit v1.2.3