diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 15:06:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:48:58 +0000 |
| commit | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch) | |
| tree | 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/gpu/tools | |
| parent | be59a35641616a4cf23c4a13fa0632624b021c1b (diff) | |
| download | qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz | |
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/gpu/tools')
| -rw-r--r-- | chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc index a90cff6d278..d93841e35ed 100644 --- a/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -17,7 +17,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <queue> #include <string> #include <utility> #include <vector> @@ -25,6 +24,7 @@ #include "base/at_exit.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/containers/queue.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -42,7 +42,6 @@ using base::TimeTicks; using base::DirectoryExists; using base::PathExists; -using std::queue; using std::string; struct SimulationSpecification { @@ -335,8 +334,8 @@ class Simulator { // Simulation task list for this execution std::unique_ptr<RenderModelSimulator> current_sim_; - queue<SimulationSpecification> sims_remaining_; - queue<SimulationSpecification> sims_completed_; + base::queue<SimulationSpecification> sims_remaining_; + base::queue<SimulationSpecification> sims_completed_; base::FilePath output_path_; // Amount of time to run each simulation int seconds_per_test_; |