| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/tests/test_memory.h" | 5 #include "ppapi/tests/test_memory.h" |
| 6 | 6 |
| 7 #include "ppapi/c/dev/ppb_memory_dev.h" | 7 #include "ppapi/c/dev/ppb_memory_dev.h" |
| 8 #include "ppapi/cpp/instance.h" | 8 #include "ppapi/cpp/instance.h" |
| 9 #include "ppapi/cpp/module.h" | 9 #include "ppapi/cpp/module.h" |
| 10 #include "ppapi/tests/testing_instance.h" | 10 #include "ppapi/tests/testing_instance.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 return memory_dev_interface_ && CheckTestingInterface(); | 23 return memory_dev_interface_ && CheckTestingInterface(); |
| 24 } | 24 } |
| 25 | 25 |
| 26 void TestMemory::RunTests(const std::string& filter) { | 26 void TestMemory::RunTests(const std::string& filter) { |
| 27 RUN_TEST(MemAlloc, filter); | 27 RUN_TEST(MemAlloc, filter); |
| 28 RUN_TEST(NullMemFree, filter); | 28 RUN_TEST(NullMemFree, filter); |
| 29 } | 29 } |
| 30 | 30 |
| 31 std::string TestMemory::TestMemAlloc() { | 31 std::string TestMemory::TestMemAlloc() { |
| 32 char* buffer = static_cast<char*>( | 32 char* buffer = static_cast<char*>( |
| 33 memory_dev_interface_->MemAlloc(kTestBufferSize)); | 33 memory_dev_interface_->MemAlloc(static_cast<uint32_t>(kTestBufferSize))); |
| 34 // Touch a couple of locations. Failure will crash the test. | 34 // Touch a couple of locations. Failure will crash the test. |
| 35 buffer[0] = '1'; | 35 buffer[0] = '1'; |
| 36 buffer[kTestBufferSize - 1] = '1'; | 36 buffer[kTestBufferSize - 1] = '1'; |
| 37 memory_dev_interface_->MemFree(buffer); | 37 memory_dev_interface_->MemFree(buffer); |
| 38 | 38 |
| 39 PASS(); | 39 PASS(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 std::string TestMemory::TestNullMemFree() { | 42 std::string TestMemory::TestNullMemFree() { |
| 43 // Failure crashes the test. | 43 // Failure crashes the test. |
| 44 memory_dev_interface_->MemFree(NULL); | 44 memory_dev_interface_->MemFree(NULL); |
| 45 | 45 |
| 46 PASS(); | 46 PASS(); |
| 47 } | 47 } |
| 48 | 48 |
| OLD | NEW |