diff options
author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 18:50:28 +0000 |
---|---|---|
committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 18:50:28 +0000 |
commit | 7407ad6a55334063610f5cca5bfb225085c2586c (patch) | |
tree | cbe450026a2b240b9bb30ebd081971ae1cae8c1b /content/common/host_shared_bitmap_manager.cc | |
parent | b999632dd3e2070d872cd0546fab7b6ea8e319a8 (diff) | |
download | chromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.zip chromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.tar.gz chromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.tar.bz2 |
Revert 256955 "Add shared bitmap managers for browser and render..."
Seems to be causing renderer crashes and possibly out-of-memory issues.
> Add shared bitmap managers for browser and renderer processes.
>
> The shared bitmap managers will allow software tiles to be allocated in shared memory, so delegated rendering could be used with them.
>
> BUG=327220
> R=danakj@chromium.org, jschuh@chromium.org, piman@chromium.org
>
> Review URL: https://codereview.chromium.org/148243013
TBR=jbauman@chromium.org
BUG=352689,352616,352618
Review URL: https://codereview.chromium.org/197703004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/host_shared_bitmap_manager.cc')
-rw-r--r-- | content/common/host_shared_bitmap_manager.cc | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/content/common/host_shared_bitmap_manager.cc b/content/common/host_shared_bitmap_manager.cc deleted file mode 100644 index aa0cd81..0000000 --- a/content/common/host_shared_bitmap_manager.cc +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright 2013 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/host_shared_bitmap_manager.h" - -#include "base/lazy_instance.h" -#include "base/memory/ref_counted.h" -#include "content/common/view_messages.h" -#include "ui/gfx/size.h" - -namespace content { - -class BitmapData : public base::RefCountedThreadSafe<BitmapData> { - public: - BitmapData(base::ProcessHandle process_handle, - base::SharedMemoryHandle memory_handle, - size_t buffer_size) - : process_handle(process_handle), - memory_handle(memory_handle), - buffer_size(buffer_size) {} - base::ProcessHandle process_handle; - base::SharedMemoryHandle memory_handle; - scoped_ptr<base::SharedMemory> memory; - size_t buffer_size; - - private: - friend class base::RefCountedThreadSafe<BitmapData>; - ~BitmapData() {} - DISALLOW_COPY_AND_ASSIGN(BitmapData); -}; - -// Holds a reference on the memory to keep it alive. -void FreeSharedMemory(scoped_refptr<BitmapData> data, - cc::SharedBitmap* bitmap) {} - -base::LazyInstance<HostSharedBitmapManager> g_shared_memory_manager = - LAZY_INSTANCE_INITIALIZER; - -HostSharedBitmapManager::HostSharedBitmapManager() {} -HostSharedBitmapManager::~HostSharedBitmapManager() {} - -HostSharedBitmapManager* HostSharedBitmapManager::current() { - return g_shared_memory_manager.Pointer(); -} - -scoped_ptr<cc::SharedBitmap> HostSharedBitmapManager::AllocateSharedBitmap( - const gfx::Size& size) { - // Bitmaps allocated in host don't need to be shared to other processes, so - // allocate them with new instead. - return scoped_ptr<cc::SharedBitmap>(); -} - -scoped_ptr<cc::SharedBitmap> HostSharedBitmapManager::GetSharedBitmapFromId( - const gfx::Size& size, - const cc::SharedBitmapId& id) { - base::AutoLock lock(lock_); - BitmapMap::iterator it = handle_map_.find(id); - if (it == handle_map_.end()) - return scoped_ptr<cc::SharedBitmap>(); - - BitmapData* data = it->second.get(); - - size_t bitmap_size; - if (!cc::SharedBitmap::GetSizeInBytes(size, &bitmap_size) || - bitmap_size > data->buffer_size) - return scoped_ptr<cc::SharedBitmap>(); - - if (!data->memory->memory()) { - TRACE_EVENT0("renderer_host", - "HostSharedBitmapManager::GetSharedBitmapFromId"); - if (!data->memory->Map(data->buffer_size)) { - return scoped_ptr<cc::SharedBitmap>(); - } - } - - scoped_ptr<cc::SharedBitmap> bitmap(new cc::SharedBitmap( - data->memory.get(), id, base::Bind(&FreeSharedMemory, it->second))); - - return bitmap.Pass(); -} - -scoped_ptr<cc::SharedBitmap> HostSharedBitmapManager::GetBitmapForSharedMemory( - base::SharedMemory*) { - return scoped_ptr<cc::SharedBitmap>(); -} - -void HostSharedBitmapManager::ChildAllocatedSharedBitmap( - size_t buffer_size, - const base::SharedMemoryHandle& handle, - base::ProcessHandle process_handle, - const cc::SharedBitmapId& id) { - base::AutoLock lock(lock_); - if (handle_map_.find(id) != handle_map_.end()) - return; - scoped_refptr<BitmapData> data( - new BitmapData(process_handle, handle, buffer_size)); - - handle_map_[id] = data; - process_map_[process_handle].insert(id); -#if defined(OS_WIN) - data->memory = make_scoped_ptr( - new base::SharedMemory(data->memory_handle, false, data->process_handle)); -#else - data->memory = - make_scoped_ptr(new base::SharedMemory(data->memory_handle, false)); -#endif -} - -void HostSharedBitmapManager::AllocateSharedBitmapForChild( - base::ProcessHandle process_handle, - size_t buffer_size, - const cc::SharedBitmapId& id, - base::SharedMemoryHandle* shared_memory_handle) { - base::AutoLock lock(lock_); - if (handle_map_.find(id) != handle_map_.end()) { - *shared_memory_handle = base::SharedMemory::NULLHandle(); - return; - } - scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory); - if (!shared_memory->CreateAndMapAnonymous(buffer_size)) { - LOG(ERROR) << "Cannot create shared memory buffer"; - *shared_memory_handle = base::SharedMemory::NULLHandle(); - return; - } - - scoped_refptr<BitmapData> data( - new BitmapData(process_handle, shared_memory->handle(), buffer_size)); - data->memory = shared_memory.Pass(); - - handle_map_[id] = data; - process_map_[process_handle].insert(id); - if (!data->memory->ShareToProcess(process_handle, shared_memory_handle)) { - LOG(ERROR) << "Cannot share shared memory buffer"; - *shared_memory_handle = base::SharedMemory::NULLHandle(); - return; - } -} - -void HostSharedBitmapManager::ChildDeletedSharedBitmap( - const cc::SharedBitmapId& id) { - base::AutoLock lock(lock_); - BitmapMap::iterator it = handle_map_.find(id); - if (it == handle_map_.end()) - return; - base::hash_set<cc::SharedBitmapId>& res = - process_map_[it->second->process_handle]; - res.erase(id); - handle_map_.erase(it); -} - -void HostSharedBitmapManager::ProcessRemoved( - base::ProcessHandle process_handle) { - base::AutoLock lock(lock_); - ProcessMap::iterator proc_it = process_map_.find(process_handle); - if (proc_it == process_map_.end()) - return; - base::hash_set<cc::SharedBitmapId>& res = proc_it->second; - - for (base::hash_set<cc::SharedBitmapId>::iterator it = res.begin(); - it != res.end(); - ++it) { - handle_map_.erase(*it); - } - process_map_.erase(proc_it); -} - -} // namespace content |