diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 20:32:22 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 20:32:22 +0000 |
commit | b6413b49b4a1bf216bbc70cc330e905c42db5c5b (patch) | |
tree | 1ea76480a59217bd06dadcb071dad2d8150a6518 /gpu/command_buffer | |
parent | a6c642112b067d998e699e09302d8c48649b108f (diff) | |
download | chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.zip chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.tar.gz chromium_src-b6413b49b4a1bf216bbc70cc330e905c42db5c5b.tar.bz2 |
shared_memory: remove wstrings, fix callers.
BUG=23581
TEST=compiles
Review URL: http://codereview.chromium.org/3555002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r-- | gpu/command_buffer/service/command_buffer_service.cc | 4 | ||||
-rw-r--r-- | gpu/command_buffer/service/gpu_processor_unittest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/command_buffer_service.cc b/gpu/command_buffer/service/command_buffer_service.cc index 0b9a87b..330e774 100644 --- a/gpu/command_buffer/service/command_buffer_service.cc +++ b/gpu/command_buffer/service/command_buffer_service.cc @@ -43,7 +43,7 @@ bool CommandBufferService::Initialize(int32 size) { num_entries_ = size / sizeof(CommandBufferEntry); ring_buffer_.reset(new SharedMemory); - if (ring_buffer_->Create(std::wstring(), false, false, size)) { + if (ring_buffer_->Create(std::string(), false, false, size)) { if (ring_buffer_->Map(size)) return true; } @@ -100,7 +100,7 @@ void CommandBufferService::SetGetOffset(int32 get_offset) { int32 CommandBufferService::CreateTransferBuffer(size_t size) { linked_ptr<SharedMemory> buffer(new SharedMemory); - if (!buffer->Create(std::wstring(), false, false, size)) + if (!buffer->Create(std::string(), false, false, size)) return -1; if (unused_registered_object_elements_.empty()) { diff --git a/gpu/command_buffer/service/gpu_processor_unittest.cc b/gpu/command_buffer/service/gpu_processor_unittest.cc index da2b9e0..f6a2f16 100644 --- a/gpu/command_buffer/service/gpu_processor_unittest.cc +++ b/gpu/command_buffer/service/gpu_processor_unittest.cc @@ -30,7 +30,7 @@ class GPUProcessorTest : public testing::Test { protected: virtual void SetUp() { shared_memory_.reset(new ::base::SharedMemory); - shared_memory_->Create(std::wstring(), false, false, kRingBufferSize); + shared_memory_->Create(std::string(), false, false, kRingBufferSize); shared_memory_->Map(kRingBufferSize); buffer_ = static_cast<int32*>(shared_memory_->memory()); shared_memory_buffer_.ptr = buffer_; |