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

Unified Diff: content/browser/android/in_process/context_provider_in_process.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/browser/android/in_process/context_provider_in_process.cc
diff --git a/content/browser/android/in_process/context_provider_in_process.cc b/content/browser/android/in_process/context_provider_in_process.cc
index bdab089f5f74239a287ed3a4357314161d14ee69..a2ac37d81cb2c8ab4140f88dbb94d85dd94fab0b 100644
--- a/content/browser/android/in_process/context_provider_in_process.cc
+++ b/content/browser/android/in_process/context_provider_in_process.cc
@@ -82,8 +82,6 @@ bool ContextProviderInProcess::BindToCurrentThread() {
if (!context3d_->InitializeOnCurrentThread())
return false;
- InitializeCapabilities();
-
const std::string unique_context_name =
base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
ContextGL()->TraceBeginCHROMIUM("gpu_toplevel", unique_context_name.c_str());
@@ -96,22 +94,10 @@ void ContextProviderInProcess::DetachFromThread() {
context_thread_checker_.DetachFromThread();
}
-void ContextProviderInProcess::InitializeCapabilities() {
- capabilities_.gpu = context3d_->GetImplementation()->capabilities();
-
- size_t mapped_memory_limit = context3d_->GetMappedMemoryLimit();
- capabilities_.max_transfer_buffer_usage_bytes =
- mapped_memory_limit ==
- WebGraphicsContext3DInProcessCommandBufferImpl::kNoLimit
- ? std::numeric_limits<size_t>::max()
- : mapped_memory_limit;
-}
-
-cc::ContextProvider::Capabilities
-ContextProviderInProcess::ContextCapabilities() {
+gpu::Capabilities ContextProviderInProcess::ContextCapabilities() {
DCHECK(lost_context_callback_proxy_); // Is bound to thread.
DCHECK(context_thread_checker_.CalledOnValidThread());
- return capabilities_;
+ return context3d_->GetImplementation()->capabilities();
}
::gpu::gles2::GLES2Interface* ContextProviderInProcess::ContextGL() {

Powered by Google App Engine
This is Rietveld 408576698