diff options
| author | dcheng <dcheng@chromium.org> | 2014-09-27 00:43:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-27 07:43:27 +0000 |
| commit | 3f8f6ea2347da4437dfd56b567c7daddfb9d8940 (patch) | |
| tree | e914bc734e45b4614e9d55b7f6f4c512fddc1a7c /mojo/embedder/simple_platform_shared_buffer_win.cc | |
| parent | 3e0ecf447b35e5bc984d9f00e192de335d5657a1 (diff) | |
| download | chromium_src-3f8f6ea2347da4437dfd56b567c7daddfb9d8940.zip chromium_src-3f8f6ea2347da4437dfd56b567c7daddfb9d8940.tar.gz chromium_src-3f8f6ea2347da4437dfd56b567c7daddfb9d8940.tar.bz2 | |
Revert of Mojo: Convert some scoped_ptr<...>(new ...) to make_scoped_ptr(new ...) in mojo/{embedder,system}. (patchset #2 id:20001 of https://codereview.chromium.org/610083002/)
Reason for revert:
scoped_ptr nullptr support was reverted.
Original issue's description:
> Mojo: Convert some scoped_ptr<...>(new ...) to make_scoped_ptr(new ...) in mojo/{embedder,system}.
>
> R=jamesr@chromium.org
>
> Committed: https://crrev.com/a60566701028a7344d17826076780eeb84b63052
> Cr-Commit-Position: refs/heads/master@{#297095}
TBR=jamesr@chromium.org,viettrungluu@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/609033002
Cr-Commit-Position: refs/heads/master@{#297108}
Diffstat (limited to 'mojo/embedder/simple_platform_shared_buffer_win.cc')
| -rw-r--r-- | mojo/embedder/simple_platform_shared_buffer_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mojo/embedder/simple_platform_shared_buffer_win.cc b/mojo/embedder/simple_platform_shared_buffer_win.cc index 73a4d6f..9736780 100644 --- a/mojo/embedder/simple_platform_shared_buffer_win.cc +++ b/mojo/embedder/simple_platform_shared_buffer_win.cc @@ -79,8 +79,9 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( } void* base = static_cast<char*>(real_base) + offset_rounding; - return make_scoped_ptr(new SimplePlatformSharedBufferMapping( - base, length, real_base, real_length)); + return scoped_ptr<PlatformSharedBufferMapping>( + new SimplePlatformSharedBufferMapping( + base, length, real_base, real_length)); } // SimplePlatformSharedBufferMapping ------------------------------------------- |