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

Unified Diff: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Issue 1268383003: Sync compositor: Ignore command buffer memory callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
index b98e3ccf57224d00ed8ab8dee8db2095cf20ab46..220c86244f057387b9221809109de194188a0e69 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -9,11 +9,11 @@
#include "base/sys_info.h"
#include "base/thread_task_runner_handle.h"
#include "content/browser/android/in_process/context_provider_in_process.h"
+#include "content/browser/android/in_process/synchronous_compositor_context_provider.h"
#include "content/browser/android/in_process/synchronous_compositor_external_begin_frame_source.h"
#include "content/browser/android/in_process/synchronous_compositor_impl.h"
#include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
-#include "content/common/gpu/client/context_provider_command_buffer.h"
#include "content/common/gpu/client/gpu_channel_host.h"
#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
#include "content/gpu/in_process_gpu_thread.h"
@@ -222,7 +222,8 @@ SynchronousCompositorFactoryImpl::CreateContextProviderForCompositor(
mem_limits.mapped_memory_reclaim_limit = mapped_memory_reclaim_limit;
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context =
CreateContext3D(surface_id, GetDefaultAttribs(), mem_limits);
- return ContextProviderCommandBuffer::Create(context.Pass(), type);
+ return make_scoped_refptr(
+ new SynchronousCompositorContextProvider(context.Pass(), type));
}
gpu::GLInProcessContextSharedMemoryLimits mem_limits;

Powered by Google App Engine
This is Rietveld 408576698