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

Unified Diff: services/ui/common/server_gpu_memory_buffer_manager.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Addressing most feedback, making this work on device. 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 side-by-side diff with in-line comments
Download patch
Index: services/ui/common/server_gpu_memory_buffer_manager.cc
diff --git a/services/ui/common/server_gpu_memory_buffer_manager.cc b/services/ui/common/server_gpu_memory_buffer_manager.cc
index a420040ed233ed150f01ca63987bc7b1e379cc06..005bd06eb1dbefbd92256ce5b53e7f0f55fb2a9c 100644
--- a/services/ui/common/server_gpu_memory_buffer_manager.cc
+++ b/services/ui/common/server_gpu_memory_buffer_manager.cc
@@ -8,6 +8,7 @@
#include "gpu/ipc/client/gpu_memory_buffer_impl.h"
#include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
#include "gpu/ipc/common/gpu_memory_buffer_support.h"
+#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
#include "services/ui/gpu/interfaces/gpu_service.mojom.h"
namespace ui {
@@ -56,7 +57,12 @@ ServerGpuMemoryBufferManager::CreateGpuMemoryBuffer(
gfx::BufferFormat format,
gfx::BufferUsage usage,
gpu::SurfaceHandle surface_handle) {
+ LOG(ERROR) << "ServerGpuMemoryBufferManager::CreateGpuMemoryBuffer";
+ LOG(ERROR) << "base::PlatformThread::GetName()"
+ << base::PlatformThread::GetName();
gfx::GpuMemoryBufferId id(next_gpu_memory_id_++);
+ // TODO(mfomitchev): Get rid of this once the viz/WS split is done.
+ mojo::SyncCallRestrictions::ScopedAllowSyncCall allow_sync_call;
gfx::GpuMemoryBufferHandle handle = CreateGpuMemoryBufferHandle(
id, client_id_, size, format, usage, surface_handle);
if (handle.is_null())

Powered by Google App Engine
This is Rietveld 408576698