cc: Fix query for RasterTaskSchedulingDelay

This CL fixes the order in which the command buffer queries are created
for the RasterTaskTotalDuration and RasterTaskSchedulingDelay UMAs. The
CL that introduced the latter assumed that the query for it was issued
before the query for the RasterTaskTotalDuration UMA [1]. However, this
was not the case.

[1] https://cs.chromium.org/chromium/src/cc/raster/gpu_raster_buffer_provider.cc?l=630-632&rcl=1eab052d8f52e823b71fd7bdd5fea70a8f95324f

Bug: 995155
Test: None.
Change-Id: Ie7f216c7900c7e99377622c3c8ba11001c2cae84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769078
Commit-Queue: Khushal <khushalsagar@chromium.org>
Reviewed-by: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690185}

cc/raster/gpu_raster_buffer_provider.cc

@@ -538,12 +538,6 @@ gpu::SyncToken GpuRasterBufferProvider::PlaybackOnWorkerThreadInternal(
   }
 
   if (measure_raster_metric) {
-    // Use a query to time the GPU side work for rasterizing this tile.
-    ri->GenQueriesEXT(1, &query->raster_duration_query_id);
-    DCHECK_GT(query->raster_duration_query_id, 0u);
-    ri->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM,
-                      query->raster_duration_query_id);
-
 #if defined(OS_CHROMEOS)
     // Use a query to detect when the GPU side is ready to start issuing raster
     // work to the driver. We will use the resulting timestamp to measure raster
@@ -559,6 +553,12 @@ gpu::SyncToken GpuRasterBufferProvider::PlaybackOnWorkerThreadInternal(
                           GL_COMMANDS_ISSUED_TIMESTAMP_CHROMIUM);
     }
 #endif
+
+    // Use a query to time the GPU side work for rasterizing this tile.
+    ri->GenQueriesEXT(1, &query->raster_duration_query_id);
+    DCHECK_GT(query->raster_duration_query_id, 0u);
+    ri->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM,
+                      query->raster_duration_query_id);
   }
 
   {