Commit b6a9b4d4 authored by viettrungluu's avatar viettrungluu Committed by Commit bot

Revert of Revert of Mojo: Convert scoped_ptr<...>() to nullptr in...

Revert of Revert of Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder. (patchset #1 id:1 of https://codereview.chromium.org/593313006/)

Reason for revert:
scoped_ptr nullptr support was un-reverted.

Original issue's description:
> Revert of Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder. (patchset #1 id:1 of https://codereview.chromium.org/606143003/)
>
> Reason for revert:
> scoped_ptr nullptr support was reverted.
>
> Original issue's description:
> > Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder.
> >
> > R=jamesr@chromium.org
> >
> > Committed: https://crrev.com/1b198fa11edbe68701e12c27d5f4981398f5ca71
> > Cr-Commit-Position: refs/heads/master@{#297093}
>
> TBR=jamesr@chromium.org,viettrungluu@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://crrev.com/76577a68922585f5621db8c63ba2ab6d5aa03f69
> Cr-Commit-Position: refs/heads/master@{#297109}

TBR=jamesr@chromium.org,dcheng@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/612923002

Cr-Commit-Position: refs/heads/master@{#297191}
parent 58b9dfcd
...@@ -52,7 +52,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::Map( ...@@ -52,7 +52,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::Map(
size_t offset, size_t offset,
size_t length) { size_t length) {
if (!IsValidMap(offset, length)) if (!IsValidMap(offset, length))
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
return MapNoCheck(offset, length); return MapNoCheck(offset, length);
} }
......
...@@ -137,7 +137,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( ...@@ -137,7 +137,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(
// return null either. // return null either.
if (real_base == MAP_FAILED || !real_base) { if (real_base == MAP_FAILED || !real_base) {
PLOG(ERROR) << "mmap"; PLOG(ERROR) << "mmap";
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
} }
void* base = static_cast<char*>(real_base) + offset_rounding; void* base = static_cast<char*>(real_base) + offset_rounding;
......
...@@ -75,7 +75,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( ...@@ -75,7 +75,7 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(
real_length); real_length);
if (!real_base) { if (!real_base) {
PLOG(ERROR) << "MapViewOfFile"; PLOG(ERROR) << "MapViewOfFile";
return scoped_ptr<PlatformSharedBufferMapping>(); return nullptr;
} }
void* base = static_cast<char*>(real_base) + offset_rounding; void* base = static_cast<char*>(real_base) + offset_rounding;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment