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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1900993002: Move SharedMemoryLimits out of WebGraphicsContext3DCommandBufferImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@limits
Patch Set: move-limits: . Created 4 years, 8 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/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 8cb504509f0e3ac8202cf9cd5885784514da07eb..6293d8b4bb6f44155e75e6698ba32b305255e0c3 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -127,6 +127,7 @@
#include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
#include "gin/public/debug.h"
#include "gpu/GLES2/gl2extchromium.h"
+#include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/ipc/client/gpu_channel_host.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_platform_file.h"
@@ -468,8 +469,7 @@ std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateOffscreenContext(
gpu::kNullSurfaceHandle,
GURL("chrome://gpu/RenderThreadImpl::CreateOffscreenContext3d"),
gpu_channel_host.get(), attributes, gfx::PreferIntegratedGpu,
- share_resources, automatic_flushes,
- WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(), nullptr));
+ share_resources, automatic_flushes, nullptr));
}
} // namespace
@@ -1531,7 +1531,7 @@ RenderThreadImpl::SharedMainThreadContextProvider() {
shared_main_thread_contexts_ = new ContextProviderCommandBuffer(
CreateOffscreenContext(std::move(gpu_channel_host)),
- RENDERER_MAINTHREAD_CONTEXT);
+ gpu::SharedMemoryLimits(), RENDERER_MAINTHREAD_CONTEXT);
if (!shared_main_thread_contexts_->BindToCurrentThread())
shared_main_thread_contexts_ = nullptr;
return shared_main_thread_contexts_;
@@ -2064,7 +2064,7 @@ RenderThreadImpl::SharedWorkerContextProvider() {
shared_worker_context_provider_ = new ContextProviderCommandBuffer(
CreateOffscreenContext(std::move(gpu_channel_host)),
- RENDER_WORKER_CONTEXT);
+ gpu::SharedMemoryLimits(), RENDER_WORKER_CONTEXT);
if (!shared_worker_context_provider_->BindToCurrentThread())
shared_worker_context_provider_ = nullptr;
if (shared_worker_context_provider_)

Powered by Google App Engine
This is Rietveld 408576698