Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: third_party/WebKit/Source/platform/SharedBufferTest.cpp

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/SharedBufferTest.cpp
diff --git a/third_party/WebKit/Source/platform/SharedBufferTest.cpp b/third_party/WebKit/Source/platform/SharedBufferTest.cpp
index 0f2218a761e796c546093c4b527291e24b01645a..2178dddf7d3f2efd508bf6f144c576b66b7187b5 100644
--- a/third_party/WebKit/Source/platform/SharedBufferTest.cpp
+++ b/third_party/WebKit/Source/platform/SharedBufferTest.cpp
@@ -50,7 +50,7 @@ TEST(SharedBufferTest, getAsBytes)
sharedBuffer->append(testData1, strlen(testData1));
sharedBuffer->append(testData2, strlen(testData2));
- const unsigned size = sharedBuffer->size();
+ const size_t size = sharedBuffer->size();
OwnPtr<char[]> data = adoptArrayPtr(new char[size]);
ASSERT_TRUE(sharedBuffer->getAsBytes(data.get(), size));
@@ -75,7 +75,7 @@ TEST(SharedBufferTest, getAsBytesLargeSegments)
sharedBuffer->append(vector1);
sharedBuffer->append(vector2);
- const unsigned size = sharedBuffer->size();
+ const size_t size = sharedBuffer->size();
OwnPtr<char[]> data = adoptArrayPtr(new char[size]);
ASSERT_TRUE(sharedBuffer->getAsBytes(data.get(), size));
@@ -100,7 +100,7 @@ TEST(SharedBufferTest, copy)
Vector<char> testData(10000);
std::generate(testData.begin(), testData.end(), &std::rand);
- unsigned length = testData.size();
+ size_t length = testData.size();
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(testData.data(), length);
sharedBuffer->append(testData.data(), length);
sharedBuffer->append(testData.data(), length);
@@ -118,14 +118,14 @@ TEST(SharedBufferTest, copy)
TEST(SharedBufferTest, constructorWithSizeOnly)
{
- unsigned length = 10000;
+ size_t length = 10000;
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(length);
ASSERT_EQ(length, sharedBuffer->size());
// The internal flat buffer should have been resized to |length| therefore getSomeData() should
// directly return the full size.
const char* data;
- ASSERT_EQ(length, sharedBuffer->getSomeData(data, 0));
+ ASSERT_EQ(length, sharedBuffer->getSomeData(data, static_cast<size_t>(0u)));
}
TEST(SharedBufferTest, createPurgeable)
@@ -137,7 +137,7 @@ TEST(SharedBufferTest, createPurgeable)
config.hasDiscardableMemorySupport = true;
TestingPlatformSupport platformWithDiscardableMemorySupport(config);
- unsigned length = testData.size();
+ size_t length = testData.size();
RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::createPurgeable(testData.data(), length);
ASSERT_EQ(length, sharedBuffer->size());
// Merge the segments into a single vector.

Powered by Google App Engine
This is Rietveld 408576698