Simplified GPU Tracer by removing parent base class.

Simplified GPU Tracer by removing parent base class.

Since the Tracer factory is implemented within gpu_tracer, it is simpler
to have the GPUTracer be a flat class rather than implementing
the noop behavior in a different object through inheritance. This CL
does not change any functionality but simply flattens GPUTracer and
combines the code for GPUTracerImpl and GPUTracerARBTimerQuery.

BUG= https://code.google.com/p/chromium/issues/detail?id=397294
TEST= trybots

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290710

[David Yen, 2014-07-25 22:28:35]

I have simplified the GPUTracer class in this CL, feel free to add any other
reviewers you think would be appropriate.

This CL merely moved around code and does not change any functionality.

[vmiura, 2014-07-29 23:45:31]

+jbauman for review.

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gles2_cmd_decoder.cc (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gles2_cmd_decoder.cc:2345: gpu_tracer_ =
scoped_ptr<GPUTracer>(new GPUTracer(this));
gpu_tracer_.reset(new GPUTracer(this));

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gpu_tracer.cc (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.cc:150: // NOTE(vmiura_: glFlush() here
can help give better trace results,
nit: NOTE(vmiura)

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.cc:159: assert(source >= 0 && source <
NUM_TRACER_SOURCES);
Please use DCHECK instead of assert here and below.

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gpu_tracer.h (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.h:69: void CalculateTimerOffset();
Should this be private?

[David Yen, 2014-08-04 22:20:06]

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gles2_cmd_decoder.cc (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gles2_cmd_decoder.cc:2345: gpu_tracer_ =
scoped_ptr<GPUTracer>(new GPUTracer(this));
On 2014/07/29 23:45:30, vmiura wrote:
> gpu_tracer_.reset(new GPUTracer(this));

Done.

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gpu_tracer.cc (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.cc:150: // NOTE(vmiura_: glFlush() here
can help give better trace results,
On 2014/07/29 23:45:30, vmiura wrote:
> nit: NOTE(vmiura)

Done.

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.cc:159: assert(source >= 0 && source <
NUM_TRACER_SOURCES);
On 2014/07/29 23:45:30, vmiura wrote:
> Please use DCHECK instead of assert here and below.

Done.

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
File gpu/command_buffer/service/gpu_tracer.h (right):

https://codereview.chromium.org/419073008/diff/1/gpu/command_buffer/service/g...
gpu/command_buffer/service/gpu_tracer.h:69: void CalculateTimerOffset();
On 2014/07/29 23:45:31, vmiura wrote:
> Should this be private?

Done.

[David Yen, 2014-08-08 16:45:35]

I've rebased this CL with master and merged the changes with the GPU Trace
simplification pass. PTAL.

[vmiura, 2014-08-14 19:43:06]

LGTM with nit, thanks.

https://codereview.chromium.org/419073008/diff/80001/gpu/command_buffer/servi...
File gpu/command_buffer/service/gpu_tracer.h (right):

https://codereview.chromium.org/419073008/diff/80001/gpu/command_buffer/servi...
gpu/command_buffer/service/gpu_tracer.h:48: GPUTracer(gles2::GLES2Decoder*
decoder);
nit: explicit

[David Yen, 2014-08-19 20:01:31]

https://codereview.chromium.org/419073008/diff/80001/gpu/command_buffer/servi...
File gpu/command_buffer/service/gpu_tracer.h (right):

https://codereview.chromium.org/419073008/diff/80001/gpu/command_buffer/servi...
gpu/command_buffer/service/gpu_tracer.h:48: GPUTracer(gles2::GLES2Decoder*
decoder);
On 2014/08/14 19:43:05, vmiura wrote:
> nit: explicit

Done.

[jbauman, 2014-08-19 20:02:17]

lgtm

[jbauman, 2014-08-19 20:02:17]

lgtm

lgtm

[David Yen, 2014-08-19 22:30:19]

The CQ bit was checked by dyen@chromium.org

[commit-bot: I haz the power, 2014-08-19 22:31:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dyen@chromium.org/419073008/120001

[commit-bot: I haz the power, 2014-08-19 23:12:17]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_tests_recipe on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tes...)

[commit-bot: I haz the power, 2014-08-20 00:12:08]

Committed patchset #7 (120001) as 290710