diff options
author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/edk/embedder/simple_platform_shared_buffer.cc | |
parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/edk/embedder/simple_platform_shared_buffer.cc')
-rw-r--r-- | mojo/edk/embedder/simple_platform_shared_buffer.cc | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.cc b/mojo/edk/embedder/simple_platform_shared_buffer.cc deleted file mode 100644 index 866250c..0000000 --- a/mojo/edk/embedder/simple_platform_shared_buffer.cc +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "mojo/edk/embedder/simple_platform_shared_buffer.h" - -#include "base/logging.h" -#include "mojo/edk/embedder/platform_handle_utils.h" - -namespace mojo { -namespace embedder { - -// static -SimplePlatformSharedBuffer* SimplePlatformSharedBuffer::Create( - size_t num_bytes) { - DCHECK_GT(num_bytes, 0u); - - SimplePlatformSharedBuffer* rv = new SimplePlatformSharedBuffer(num_bytes); - if (!rv->Init()) { - // We can't just delete it directly, due to the "in destructor" (debug) - // check. - scoped_refptr<SimplePlatformSharedBuffer> deleter(rv); - return nullptr; - } - - return rv; -} - -// static -SimplePlatformSharedBuffer* -SimplePlatformSharedBuffer::CreateFromPlatformHandle( - size_t num_bytes, - ScopedPlatformHandle platform_handle) { - DCHECK_GT(num_bytes, 0u); - - SimplePlatformSharedBuffer* rv = new SimplePlatformSharedBuffer(num_bytes); - if (!rv->InitFromPlatformHandle(platform_handle.Pass())) { - // We can't just delete it directly, due to the "in destructor" (debug) - // check. - scoped_refptr<SimplePlatformSharedBuffer> deleter(rv); - return nullptr; - } - - return rv; -} - -size_t SimplePlatformSharedBuffer::GetNumBytes() const { - return num_bytes_; -} - -scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::Map( - size_t offset, - size_t length) { - if (!IsValidMap(offset, length)) - return nullptr; - - return MapNoCheck(offset, length); -} - -bool SimplePlatformSharedBuffer::IsValidMap(size_t offset, size_t length) { - if (offset > num_bytes_ || length == 0) - return false; - - // Note: This is an overflow-safe check of |offset + length > num_bytes_| - // (that |num_bytes >= offset| is verified above). - if (length > num_bytes_ - offset) - return false; - - return true; -} - -scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapNoCheck( - size_t offset, - size_t length) { - DCHECK(IsValidMap(offset, length)); - return MapImpl(offset, length); -} - -ScopedPlatformHandle SimplePlatformSharedBuffer::DuplicatePlatformHandle() { - return mojo::embedder::DuplicatePlatformHandle(handle_.get()); -} - -ScopedPlatformHandle SimplePlatformSharedBuffer::PassPlatformHandle() { - DCHECK(HasOneRef()); - return handle_.Pass(); -} - -SimplePlatformSharedBuffer::SimplePlatformSharedBuffer(size_t num_bytes) - : num_bytes_(num_bytes) { -} - -SimplePlatformSharedBuffer::~SimplePlatformSharedBuffer() { -} - -SimplePlatformSharedBufferMapping::~SimplePlatformSharedBufferMapping() { - Unmap(); -} - -void* SimplePlatformSharedBufferMapping::GetBase() const { - return base_; -} - -size_t SimplePlatformSharedBufferMapping::GetLength() const { - return length_; -} - -} // namespace embedder -} // namespace mojo |