content/renderer/render_thread_impl.cc - Issue 1900993002: Move SharedMemoryLimits out of WebGraphicsContext3DCommandBufferImpl.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase 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

« content/browser/renderer_host/compositor_impl_android.cc ('K') | « content/renderer/pepper/video_decoder_shim.cc ('k') | content/renderer/render_widget.cc » ('j') | gpu/command_buffer/client/shared_memory_limits.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 5126b349b06b6168f16dd8caa396a45033cbc552..5774593e0d198f17ea591d6ab843ebba4f063e65 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_;

@@ -2050,7 +2050,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_)