Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Side by Side Diff: services/ui/public/cpp/bitmap/child_shared_bitmap_manager.cc

Issue 2909873002: Add cc::SharedBitmap::shared_memory_handle() (Closed)
Patch Set: fix tests Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/viz/display_compositor/host_shared_bitmap_manager_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/ui/public/cpp/bitmap/child_shared_bitmap_manager.h" 5 #include "services/ui/public/cpp/bitmap/child_shared_bitmap_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 28 matching lines...) Expand all
39 : ChildSharedBitmap(shared_bitmap_manager_ptr, 39 : ChildSharedBitmap(shared_bitmap_manager_ptr,
40 shared_memory_holder.get(), 40 shared_memory_holder.get(),
41 id) { 41 id) {
42 shared_memory_holder_ = std::move(shared_memory_holder); 42 shared_memory_holder_ = std::move(shared_memory_holder);
43 } 43 }
44 44
45 ~ChildSharedBitmap() override { 45 ~ChildSharedBitmap() override {
46 (*shared_bitmap_manager_ptr_)->DidDeleteSharedBitmap(id()); 46 (*shared_bitmap_manager_ptr_)->DidDeleteSharedBitmap(id());
47 } 47 }
48 48
49 // cc::SharedBitmap:
50 base::SharedMemoryHandle GetSharedMemoryHandle() const override {
51 if (!shared_memory_holder_)
52 return base::SharedMemoryHandle();
53 return shared_memory_holder_->handle();
54 }
55
49 private: 56 private:
50 scoped_refptr<cc::mojom::ThreadSafeSharedBitmapManagerAssociatedPtr> 57 scoped_refptr<cc::mojom::ThreadSafeSharedBitmapManagerAssociatedPtr>
51 shared_bitmap_manager_ptr_; 58 shared_bitmap_manager_ptr_;
52 std::unique_ptr<base::SharedMemory> shared_memory_holder_; 59 std::unique_ptr<base::SharedMemory> shared_memory_holder_;
53 }; 60 };
54 61
55 // Collect extra information for debugging bitmap creation failures. 62 // Collect extra information for debugging bitmap creation failures.
56 void CollectMemoryUsageAndDie(const gfx::Size& size, size_t alloc_size) { 63 void CollectMemoryUsageAndDie(const gfx::Size& size, size_t alloc_size) {
57 #if defined(OS_WIN) 64 #if defined(OS_WIN)
58 int width = size.width(); 65 int width = size.width();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } 163 }
157 164
158 mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle( 165 mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle(
159 handle_to_send, memory->mapped_size(), true /* read_only */); 166 handle_to_send, memory->mapped_size(), true /* read_only */);
160 167
161 (*shared_bitmap_manager_ptr_) 168 (*shared_bitmap_manager_ptr_)
162 ->DidAllocateSharedBitmap(std::move(buffer_handle), id); 169 ->DidAllocateSharedBitmap(std::move(buffer_handle), id);
163 } 170 }
164 171
165 } // namespace ui 172 } // namespace ui
OLDNEW
« no previous file with comments | « components/viz/display_compositor/host_shared_bitmap_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698