summaryrefslogtreecommitdiffstats
path: root/cc/raster
diff options
context:
space:
mode:
authordyen <dyen@chromium.org>2015-07-21 16:40:10 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 23:41:56 +0000
commit2b089f9f3c4cdeb163aa81b35911ba3d1c53ed9a (patch)
tree0a07dad6a745b47701cb498c84455d643ad22bb1 /cc/raster
parentc0299ae3c8a93f9d19d2367e4cc7568231f708bb (diff)
downloadchromium_src-2b089f9f3c4cdeb163aa81b35911ba3d1c53ed9a.zip
chromium_src-2b089f9f3c4cdeb163aa81b35911ba3d1c53ed9a.tar.gz
chromium_src-2b089f9f3c4cdeb163aa81b35911ba3d1c53ed9a.tar.bz2
Merge Group Markers into Chromium Traces.
In a previous CL top level group markers were converted to using chromium traces: https://codereview.chromium.org/780653007/ The initial thought was that we would standardize on a single trace type. This is a transitional step which moves the debug marker manager to be set in the chromium traces, and also makes the group marker calls mimic the chromium trace calls. Eventually the group marker calls should be deprecated. R=sievers@chromium.org, vmiura@chromium.org BUG=242999, 503166 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1132283003 Cr-Commit-Position: refs/heads/master@{#339781}
Diffstat (limited to 'cc/raster')
-rw-r--r--cc/raster/scoped_gpu_raster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/raster/scoped_gpu_raster.cc b/cc/raster/scoped_gpu_raster.cc
index f548515..e6dcf23 100644
--- a/cc/raster/scoped_gpu_raster.cc
+++ b/cc/raster/scoped_gpu_raster.cc
@@ -27,7 +27,7 @@ void ScopedGpuRaster::BeginGpuRaster() {
// TODO(alokp): Use a trace macro to push/pop markers.
// Using push/pop functions directly incurs cost to evaluate function
// arguments even when tracing is disabled.
- gl->PushGroupMarkerEXT(0, "GpuRasterization");
+ gl->TraceBeginCHROMIUM("ScopedGpuRaster", "GpuRasterization");
class GrContext* gr_context = context_provider_->GrContext();
gr_context->resetContext();
@@ -45,7 +45,7 @@ void ScopedGpuRaster::EndGpuRaster() {
// TODO(alokp): Use a trace macro to push/pop markers.
// Using push/pop functions directly incurs cost to evaluate function
// arguments even when tracing is disabled.
- gl->PopGroupMarkerEXT();
+ gl->TraceEndCHROMIUM();
}
} // namespace cc