projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
mojo
/
system
/
local_data_pipe.h
diff --git
a/src/mojo/system/local_data_pipe.h
b/src/mojo/system/local_data_pipe.h
index
97d108e
..
973ab68
100644
(file)
--- a/
src/mojo/system/local_data_pipe.h
+++ b/
src/mojo/system/local_data_pipe.h
@@
-70,7
+70,7
@@
class MOJO_SYSTEM_IMPL_EXPORT LocalDataPipe : public DataPipe {
void MarkDataAsConsumedNoLock(size_t num_bytes);
// The members below are protected by |DataPipe|'s |lock_|:
void MarkDataAsConsumedNoLock(size_t num_bytes);
// The members below are protected by |DataPipe|'s |lock_|:
- scoped_ptr
_malloc<char, base::ScopedPtrAlignedFree
> buffer_;
+ scoped_ptr
<char, base::AlignedFreeDeleter
> buffer_;
// Circular buffer.
size_t start_index_;
size_t current_num_bytes_;
// Circular buffer.
size_t start_index_;
size_t current_num_bytes_;