gpu/command_buffer/client/gles2_implementation.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: gpu/command_buffer/client/gles2_implementation.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') | « gpu/command_buffer/client/gles2_implementation.h ('k') | gpu/command_buffer/client/gles2_implementation_unittest.cc » ('j') | gpu/command_buffer/client/shared_memory_limits.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/client/gles2_implementation.cc

diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc

index 22032b0147c4d3a9ba33a19a6373b8bf1327ff28..e3f765103f560c260b27b3565cdc9b0424e606e3 100644

--- a/gpu/command_buffer/client/gles2_implementation.cc

+++ b/gpu/command_buffer/client/gles2_implementation.cc

@@ -32,6 +32,7 @@

#include "gpu/command_buffer/client/gpu_control.h"

#include "gpu/command_buffer/client/program_info_manager.h"

#include "gpu/command_buffer/client/query_tracker.h"

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

#include "gpu/command_buffer/client/transfer_buffer.h"

#include "gpu/command_buffer/client/vertex_array_object_manager.h"

#include "gpu/command_buffer/common/gles2_cmd_utils.h"

@@ -215,7 +216,7 @@ bool GLES2Implementation::Initialize(

mapped_memory_.reset(new MappedMemoryManager(helper_, mapped_memory_limit));

unsigned chunk_size = 2 * 1024 * 1024;

- if (mapped_memory_limit != kNoLimit) {

+ if (mapped_memory_limit != SharedMemoryLimits::kNoLimit) {

// Use smaller chunks if the client is very memory conscientious.

chunk_size = std::min(mapped_memory_limit / 4, chunk_size);

}