summaryrefslogtreecommitdiff
path: root/chromium/cc/benchmarks
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 17:21:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-23 16:25:15 +0000
commitc551f43206405019121bd2b2c93714319a0a3300 (patch)
tree1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/cc/benchmarks
parent7961cea6d1041e3e454dae6a1da660b453efd238 (diff)
downloadqtwebengine-chromium-c551f43206405019121bd2b2c93714319a0a3300.tar.gz
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/benchmarks')
-rw-r--r--chromium/cc/benchmarks/invalidation_benchmark.cc6
-rw-r--r--chromium/cc/benchmarks/rasterize_and_record_benchmark.cc6
-rw-r--r--chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc10
3 files changed, 8 insertions, 14 deletions
diff --git a/chromium/cc/benchmarks/invalidation_benchmark.cc b/chromium/cc/benchmarks/invalidation_benchmark.cc
index 8df14b6f4e7..08402bdc4ac 100644
--- a/chromium/cc/benchmarks/invalidation_benchmark.cc
+++ b/chromium/cc/benchmarks/invalidation_benchmark.cc
@@ -15,7 +15,6 @@
#include "cc/layers/picture_layer.h"
#include "cc/trees/draw_property_utils.h"
#include "cc/trees/layer_tree_host.h"
-#include "cc/trees/layer_tree_host_common.h"
#include "ui/gfx/geometry/rect.h"
namespace cc {
@@ -63,9 +62,8 @@ InvalidationBenchmark::InvalidationBenchmark(
InvalidationBenchmark::~InvalidationBenchmark() = default;
void InvalidationBenchmark::DidUpdateLayers(LayerTreeHost* layer_tree_host) {
- LayerTreeHostCommon::CallFunctionForEveryLayer(
- layer_tree_host,
- [this](Layer* layer) { layer->RunMicroBenchmark(this); });
+ for (auto* layer : *layer_tree_host)
+ layer->RunMicroBenchmark(this);
}
void InvalidationBenchmark::RunOnLayer(PictureLayer* layer) {
diff --git a/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc b/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
index 61bc65532ad..120203ca4ab 100644
--- a/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
+++ b/chromium/cc/benchmarks/rasterize_and_record_benchmark.cc
@@ -22,7 +22,6 @@
#include "cc/layers/recording_source.h"
#include "cc/paint/display_item_list.h"
#include "cc/trees/layer_tree_host.h"
-#include "cc/trees/layer_tree_host_common.h"
#include "ui/gfx/geometry/rect.h"
namespace cc {
@@ -86,9 +85,8 @@ RasterizeAndRecordBenchmark::~RasterizeAndRecordBenchmark() {
void RasterizeAndRecordBenchmark::DidUpdateLayers(
LayerTreeHost* layer_tree_host) {
layer_tree_host_ = layer_tree_host;
- LayerTreeHostCommon::CallFunctionForEveryLayer(
- layer_tree_host_,
- [this](Layer* layer) { layer->RunMicroBenchmark(this); });
+ for (auto* layer : *layer_tree_host)
+ layer->RunMicroBenchmark(this);
DCHECK(!results_.get());
results_ = base::WrapUnique(new base::DictionaryValue);
diff --git a/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc b/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
index 93b5d5dfc4e..609b925b264 100644
--- a/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
+++ b/chromium/cc/benchmarks/rasterize_and_record_benchmark_impl.cc
@@ -15,7 +15,6 @@
#include "cc/layers/picture_layer_impl.h"
#include "cc/raster/playback_image_provider.h"
#include "cc/raster/raster_buffer_provider.h"
-#include "cc/trees/layer_tree_host_common.h"
#include "cc/trees/layer_tree_host_impl.h"
#include "cc/trees/layer_tree_impl.h"
#include "ui/gfx/geometry/axis_transform2d.h"
@@ -146,11 +145,10 @@ RasterizeAndRecordBenchmarkImpl::~RasterizeAndRecordBenchmarkImpl() = default;
void RasterizeAndRecordBenchmarkImpl::DidCompleteCommit(
LayerTreeHostImpl* host) {
- LayerTreeHostCommon::CallFunctionForEveryLayer(
- host->active_tree(), [this](LayerImpl* layer) {
- rasterize_results_.total_layers++;
- layer->RunMicroBenchmark(this);
- });
+ for (auto* layer : *host->active_tree()) {
+ rasterize_results_.total_layers++;
+ layer->RunMicroBenchmark(this);
+ }
std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
result->SetDouble("rasterize_time_ms",