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

Unified Diff: gpu/command_buffer/client/fenced_allocator_test.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years 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
« no previous file with comments | « gpu/command_buffer/client/fenced_allocator.cc ('k') | gpu/command_buffer/client/gl_in_process_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/fenced_allocator_test.cc
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index 8635d0bceb49bda59319c8135be369099e4403aa..4ee2ea2442d033d2b2d6dbb1c9c1013971869d09 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -4,6 +4,8 @@
// This file contains the tests for the FencedAllocator class.
+#include <stdint.h>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/aligned_memory.h"
@@ -65,9 +67,7 @@ class BaseFencedAllocatorTest : public testing::Test {
helper_->Initialize(kBufferSize);
}
- int32 GetToken() {
- return command_buffer_->GetLastState().token;
- }
+ int32_t GetToken() { return command_buffer_->GetLastState().token; }
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_refptr<TransferBufferManagerInterface> transfer_buffer_manager_;
@@ -194,7 +194,7 @@ TEST_F(FencedAllocatorTest, TestFreePendingToken) {
EXPECT_TRUE(allocator_->CheckConsistency());
// Free one successful allocation, pending fence.
- int32 token = helper_.get()->InsertToken();
+ int32_t token = helper_.get()->InsertToken();
allocator_->FreePendingToken(offsets[0], token);
EXPECT_TRUE(allocator_->CheckConsistency());
@@ -241,7 +241,7 @@ TEST_F(FencedAllocatorTest, FreeUnused) {
EXPECT_EQ(0u, allocator_->GetLargestFreeSize());
// Free one successful allocation, pending fence.
- int32 token = helper_.get()->InsertToken();
+ int32_t token = helper_.get()->InsertToken();
allocator_->FreePendingToken(offsets[0], token);
EXPECT_TRUE(allocator_->CheckConsistency());
@@ -357,7 +357,7 @@ TEST_F(FencedAllocatorTest, TestGetLargestFreeOrPendingSize) {
allocator_->GetLargestFreeOrPendingSize());
// Free the last one, pending a token.
- int32 token = helper_.get()->InsertToken();
+ int32_t token = helper_.get()->InsertToken();
allocator_->FreePendingToken(offset2, token);
// Now all the buffers have been freed...
@@ -545,7 +545,7 @@ TEST_F(FencedAllocatorWrapperTest, TestFreePendingToken) {
EXPECT_TRUE(allocator_->CheckConsistency());
// Free one successful allocation, pending fence.
- int32 token = helper_.get()->InsertToken();
+ int32_t token = helper_.get()->InsertToken();
allocator_->FreePendingToken(pointers[0], token);
EXPECT_TRUE(allocator_->CheckConsistency());
« no previous file with comments | « gpu/command_buffer/client/fenced_allocator.cc ('k') | gpu/command_buffer/client/gl_in_process_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698