| Index: content/browser/renderer_host/compositor_impl_android.cc
|
| diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
|
| index 335a30f3b93915ff6825be553f74bd12df3c7040..9420ce9d3aa7630f1dbf83fc17ac60cca319c6ee 100644
|
| --- a/content/browser/renderer_host/compositor_impl_android.cc
|
| +++ b/content/browser/renderer_host/compositor_impl_android.cc
|
| @@ -54,7 +54,6 @@
|
| #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
|
| #include "content/browser/gpu/compositor_util.h"
|
| #include "content/browser/renderer_host/render_widget_host_impl.h"
|
| -#include "content/common/gpu_stream_constants.h"
|
| #include "content/public/browser/android/compositor.h"
|
| #include "content/public/browser/android/compositor_client.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -204,15 +203,12 @@
|
| if (!gpu_channel_host)
|
| callback.Run(nullptr);
|
|
|
| - int32_t stream_id = kGpuStreamIdDefault;
|
| - gpu::SchedulingPriority stream_priority = kGpuStreamPriorityUI;
|
| -
|
| constexpr bool automatic_flushes = false;
|
| constexpr bool support_locking = false;
|
| -
|
| scoped_refptr<ui::ContextProviderCommandBuffer> context_provider =
|
| new ui::ContextProviderCommandBuffer(
|
| - std::move(gpu_channel_host), stream_id, stream_priority, handle,
|
| + std::move(gpu_channel_host), gpu::GPU_STREAM_DEFAULT,
|
| + gpu::GpuStreamPriority::NORMAL, handle,
|
| GURL(std::string("chrome://gpu/Compositor::CreateContextProvider")),
|
| automatic_flushes, support_locking, shared_memory_limits, attributes,
|
| nullptr /* shared_context */,
|
| @@ -723,18 +719,13 @@
|
|
|
| DCHECK(window_);
|
| DCHECK_NE(surface_handle_, gpu::kNullSurfaceHandle);
|
| -
|
| - int32_t stream_id = kGpuStreamIdDefault;
|
| - gpu::SchedulingPriority stream_priority = kGpuStreamPriorityUI;
|
| -
|
| constexpr bool support_locking = false;
|
| constexpr bool automatic_flushes = false;
|
| -
|
| ui::ContextProviderCommandBuffer* shared_context = nullptr;
|
| scoped_refptr<ui::ContextProviderCommandBuffer> context_provider =
|
| new ui::ContextProviderCommandBuffer(
|
| - std::move(gpu_channel_host), stream_id, stream_priority,
|
| - surface_handle_,
|
| + std::move(gpu_channel_host), gpu::GPU_STREAM_DEFAULT,
|
| + gpu::GpuStreamPriority::NORMAL, surface_handle_,
|
| GURL(std::string("chrome://gpu/CompositorImpl::") +
|
| std::string("CompositorContextProvider")),
|
| automatic_flushes, support_locking,
|
|
|