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

Side by Side Diff: content/browser/android/in_process/context_provider_in_process.cc

Issue 1132283003: Merge Group Markers into Chromium Traces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make SwapBuffers use the GLES2Decoder GL_Category Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « cc/raster/scoped_gpu_raster.cc ('k') | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/in_process/context_provider_in_process.h" 5 #include "content/browser/android/in_process/context_provider_in_process.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "cc/output/managed_memory_policy.h" 10 #include "cc/output/managed_memory_policy.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 DCHECK(context_thread_checker_.CalledOnValidThread()); 76 DCHECK(context_thread_checker_.CalledOnValidThread());
77 77
78 if (lost_context_callback_proxy_) 78 if (lost_context_callback_proxy_)
79 return true; 79 return true;
80 80
81 if (!context3d_->InitializeOnCurrentThread()) 81 if (!context3d_->InitializeOnCurrentThread())
82 return false; 82 return false;
83 83
84 InitializeCapabilities(); 84 InitializeCapabilities();
85 85
86 std::string unique_context_name = 86 const std::string unique_context_name =
87 base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get()); 87 base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
88 context3d_->traceBeginCHROMIUM("gpu_toplevel", 88 context3d_->traceBeginCHROMIUM("gpu_toplevel",
89 unique_context_name.c_str()); 89 unique_context_name.c_str());
90 90
91 lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this)); 91 lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this));
92 return true; 92 return true;
93 } 93 }
94 94
95 void ContextProviderInProcess::DetachFromThread() { 95 void ContextProviderInProcess::DetachFromThread() {
96 context_thread_checker_.DetachFromThread(); 96 context_thread_checker_.DetachFromThread();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 lost_context_callback.is_null()); 202 lost_context_callback.is_null());
203 lost_context_callback_ = lost_context_callback; 203 lost_context_callback_ = lost_context_callback;
204 } 204 }
205 205
206 void ContextProviderInProcess::SetMemoryPolicyChangedCallback( 206 void ContextProviderInProcess::SetMemoryPolicyChangedCallback(
207 const MemoryPolicyChangedCallback& memory_policy_changed_callback) { 207 const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
208 // There's no memory manager for the in-process implementation. 208 // There's no memory manager for the in-process implementation.
209 } 209 }
210 210
211 } // namespace content 211 } // namespace content
OLDNEW
« no previous file with comments | « cc/raster/scoped_gpu_raster.cc ('k') | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698