Move discardable memory to //components from //content

components/discardable_memory/common/discardable_shared_memory_heap.cc

 // 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 "content/common/discardable_shared_memory_heap.h"
+#include "components/discardable_memory/common/discardable_shared_memory_heap.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/memory/discardable_shared_memory.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_dump_manager.h"
 
-namespace content {
+namespace discardable_memory {
 namespace {
 
 bool IsPowerOfTwo(size_t x) {
   return (x & (x - 1)) == 0;
 }
 
 bool IsInFreeList(DiscardableSharedMemoryHeap::Span* span) {
   return span->previous() || span->next();
 }
 
 }  // namespace
 
 DiscardableSharedMemoryHeap::Span::Span(
     base::DiscardableSharedMemory* shared_memory,
     size_t start,
     size_t length)
     : shared_memory_(shared_memory),
       start_(start),
       length_(length),
       is_locked_(false) {}
 
-DiscardableSharedMemoryHeap::Span::~Span() {
-}
+DiscardableSharedMemoryHeap::Span::~Span() {}
 
 DiscardableSharedMemoryHeap::ScopedMemorySegment::ScopedMemorySegment(
     DiscardableSharedMemoryHeap* heap,
     std::unique_ptr<base::DiscardableSharedMemory> shared_memory,
     size_t size,
     int32_t id,
     const base::Closure& deleted_callback)
     : heap_(heap),
       shared_memory_(std::move(shared_memory)),
       size_(size),
@@ skipping 196 matching lines @@
 size_t DiscardableSharedMemoryHeap::GetSize() const {
   return num_blocks_ * block_size_;
 }
 
 size_t DiscardableSharedMemoryHeap::GetSizeOfFreeLists() const {
   return num_free_blocks_ * block_size_;
 }
 
 bool DiscardableSharedMemoryHeap::OnMemoryDump(
     base::trace_event::ProcessMemoryDump* pmd) {
-  std::for_each(
-      memory_segments_.begin(), memory_segments_.end(),
-      [pmd](const ScopedMemorySegment* segment) {
-        segment->OnMemoryDump(pmd);
-      });
+  std::for_each(memory_segments_.begin(), memory_segments_.end(),
+                [pmd](const ScopedMemorySegment* segment) {
+                  segment->OnMemoryDump(pmd);
+                });
   return true;
 }
 
 void DiscardableSharedMemoryHeap::InsertIntoFreeList(
     std::unique_ptr<DiscardableSharedMemoryHeap::Span> span) {
   DCHECK(!IsInFreeList(span.get()));
   size_t index = std::min(span->length_, arraysize(free_spans_)) - 1;
   free_spans_[index].Append(span.release());
 }
 
 std::unique_ptr<DiscardableSharedMemoryHeap::Span>
 DiscardableSharedMemoryHeap::RemoveFromFreeList(Span* span) {
   DCHECK(IsInFreeList(span));
   span->RemoveFromList();
   return base::WrapUnique(span);
 }
 
 std::unique_ptr<DiscardableSharedMemoryHeap::Span>
 DiscardableSharedMemoryHeap::Carve(Span* span, size_t blocks) {
   std::unique_ptr<Span> serving = RemoveFromFreeList(span);
 
-  const int extra = serving->length_ - blocks;
+  const size_t extra = serving->length_ - blocks;

[reveman, 2016/10/31 22:46:02]

did you need this to fix the build? just curious

[Peng, 2016/11/01 14:26:18]

Yes. It causes a warning on WIN build. Not sure why it doesn't happen when this
file is in content/.

   if (extra) {
     std::unique_ptr<Span> leftover(
         new Span(serving->shared_memory_, serving->start_ + blocks, extra));
     leftover->set_is_locked(false);
     DCHECK(extra == 1 || spans_.find(leftover->start_) == spans_.end());
     RegisterSpan(leftover.get());
 
     // No need to coalesce as the previous span of |leftover| was just split
     // and the next span of |leftover| was not previously coalesced with
     // |span|.
@@ skipping 173 matching lines @@
 
   ScopedVector<ScopedMemorySegment>::const_iterator it =
       std::find_if(memory_segments_.begin(), memory_segments_.end(),
                    [span](const ScopedMemorySegment* segment) {
                      return segment->ContainsSpan(span);
                    });
   DCHECK(it != memory_segments_.end());
   return (*it)->CreateMemoryAllocatorDump(span, block_size_, name, pmd);
 }
 
-}  // namespace content
+}  // namespace discardable_memory