Chromium Code Reviews| Index: base/memory/ref_counted_memory.cc |
| diff --git a/base/memory/ref_counted_memory.cc b/base/memory/ref_counted_memory.cc |
| index aa160318a9154c9d6bf711b9a73e7b41c3000f73..6e6a1e696772a37bf58eb682e05e3741997291f4 100644 |
| --- a/base/memory/ref_counted_memory.cc |
| +++ b/base/memory/ref_counted_memory.cc |
| @@ -4,6 +4,10 @@ |
| #include "base/memory/ref_counted_memory.h" |
| +#include <stdlib.h> |
| + |
| +#include "base/logging.h" |
| + |
| RefCountedMemory::RefCountedMemory() { |
| } |
| @@ -22,25 +26,49 @@ RefCountedBytes::RefCountedBytes() { |
| } |
| RefCountedBytes::RefCountedBytes(const std::vector<unsigned char>& initializer) |
| - : data(initializer) { |
| + : data_(initializer) { |
| } |
| RefCountedBytes* RefCountedBytes::TakeVector( |
| std::vector<unsigned char>* to_destroy) { |
| RefCountedBytes* bytes = new RefCountedBytes; |
| - bytes->data.swap(*to_destroy); |
| + bytes->data_.swap(*to_destroy); |
| return bytes; |
| } |
| const unsigned char* RefCountedBytes::front() const { |
| // STL will assert if we do front() on an empty vector, but calling code |
| // expects a NULL. |
| - return size() ? &data.front() : NULL; |
| + return size() ? &data_.front() : NULL; |
| } |
| size_t RefCountedBytes::size() const { |
| - return data.size(); |
| + return data_.size(); |
| } |
| RefCountedBytes::~RefCountedBytes() { |
| } |
| + |
| +namespace base { |
| + |
| +RefCountedString::RefCountedString() {} |
| + |
| +RefCountedString::~RefCountedString() {} |
| + |
| +// static |
| +RefCountedString* RefCountedString::TakeString(std::string* to_destroy) { |
| + RefCountedString* self = new RefCountedString; |
| + to_destroy->swap(self->data_); |
| + return self; |
| +} |
| + |
| +const unsigned char* RefCountedString::front() const { |
| + return data_.empty() ? NULL : |
| + reinterpret_cast<const unsigned char*>(data_.data()); |
| +} |
| + |
| +size_t RefCountedString::size() const { |
| + return data_.size(); |
| +} |
| + |
| +} // namespace base |
|
brettw
2011/07/19 19:58:45
Need an extra space before // (2 total).
joth
2011/07/20 12:53:03
Done.
|