content/renderer/render_widget.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_widget.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

« content/common/gpu/client/context_provider_command_buffer.h ('K') | « content/renderer/render_thread_impl.cc ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_widget.cc

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

index 7525ed91e5f9829b73f4895fc5e5dda48bbfddc6..25c2b0467a070c73526361cfb86ff30850b90576 100644

--- a/content/renderer/render_widget.cc

+++ b/content/renderer/render_widget.cc

@@ -62,6 +62,7 @@

#include "content/renderer/render_widget_owner_delegate.h"

#include "content/renderer/renderer_blink_platform_impl.h"

#include "content/renderer/resizing_mode_selector.h"

+#include "gpu/command_buffer/client/shared_memory_limits.h"

#include "ipc/ipc_sync_message.h"

#include "skia/ext/platform_canvas.h"

#include "third_party/WebKit/public/platform/WebCursorInfo.h"

@@ -222,7 +223,7 @@ CreateOffscreenContext(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,

attributes.bind_generates_resource = false;

attributes.lose_context_when_out_of_memory = true;

- content::WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits limits;

+ gpu::SharedMemoryLimits limits;

// The renderer compositor context doesn't do a lot of stuff, so we don't

// expect it to need a lot of space for commands or transfer. Raster and

// uploads happen on the worker context instead.

@@ -235,8 +236,7 @@ CreateOffscreenContext(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,

return base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl(

gpu::kNullSurfaceHandle, url, gpu_channel_host.get(), attributes,

- gfx::PreferIntegratedGpu, share_resources, automatic_flushes, limits,

- nullptr));

+ gfx::PreferIntegratedGpu, share_resources, automatic_flushes, nullptr));

}

} // namespace

@@ -793,7 +793,7 @@ std::unique_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(

context_provider = new ContextProviderCommandBuffer(

CreateOffscreenContext(std::move(gpu_channel_host),

GetURLForGraphicsContext3D()),

- RENDER_COMPOSITOR_CONTEXT);

+ gpu::SharedMemoryLimits(), RENDER_COMPOSITOR_CONTEXT);

worker_context_provider =

RenderThreadImpl::current()->SharedWorkerContextProvider();

if (!worker_context_provider) {