Chromium roll (https://codereview.chromium.org/976353002)

ui/gl/gpu_timing.h

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_TIMING_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_TIMING_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gl/gl_export.h"
@@ skipping 34 matching lines @@
 class GPUTiming {
  public:
   enum TimerType {
     kTimerTypeInvalid = -1,
 
     kTimerTypeARB,      // ARB_timer_query
     kTimerTypeDisjoint  // EXT_disjoint_timer_query
   };
 
   TimerType GetTimerType() const { return timer_type_; }
+  uint32_t GetDisjointCount();
 
  private:
   friend struct base::DefaultDeleter<GPUTiming>;
   friend class GLContextReal;
   explicit GPUTiming(GLContextReal* context);
   ~GPUTiming();
 
   scoped_refptr<GPUTimingClient> CreateGPUTimingClient();
 
   TimerType timer_type_ = kTimerTypeInvalid;
+  uint32_t disjoint_counter_ = 0;
   DISALLOW_COPY_AND_ASSIGN(GPUTiming);
 };
 
 // Class to compute the amount of time it takes to fully
 // complete a set of GL commands
 class GL_EXPORT GPUTimer {
  public:
   ~GPUTimer();
 
   void Start();
@@ skipping 43 matching lines @@
  private:
   friend class base::RefCounted<GPUTimingClient>;
   friend class GPUTimer;
   friend class GPUTiming;
 
   virtual ~GPUTimingClient();
 
   GPUTiming* gpu_timing_;
   GPUTiming::TimerType timer_type_ = GPUTiming::kTimerTypeInvalid;
   int64 offset_ = 0;  // offset cache when timer_type_ == kTimerTypeARB
+  uint32_t disjoint_counter_ = 0;
   bool offset_valid_ = false;
   base::Callback<int64(void)> cpu_time_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(GPUTimingClient);
 };
 
 }  // namespace gfx
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TIMING_H_