| Index: gpu/tools/compositor_model_bench/render_models.cc
|
| diff --git a/gpu/tools/compositor_model_bench/render_models.cc b/gpu/tools/compositor_model_bench/render_models.cc
|
| index bbbfac6cda64845392370af38f3b940e0de91d81..a784706a3e91f26b668a2fefc5355c952d742e19 100644
|
| --- a/gpu/tools/compositor_model_bench/render_models.cc
|
| +++ b/gpu/tools/compositor_model_bench/render_models.cc
|
| @@ -5,7 +5,9 @@
|
| #include "gpu/tools/compositor_model_bench/render_models.h"
|
|
|
| #include <string>
|
| +#include <utility>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "gpu/tools/compositor_model_bench/forward_render_model.h"
|
|
|
| const char* ModelToString(RenderModel m) {
|
| @@ -17,25 +19,24 @@ const char* ModelToString(RenderModel m) {
|
| }
|
| }
|
|
|
| -RenderModelSimulator::RenderModelSimulator(RenderNode* root) : root_(root) {
|
| -}
|
| +RenderModelSimulator::RenderModelSimulator(std::unique_ptr<RenderNode> root)
|
| + : root_(std::move(root)) {}
|
|
|
| RenderModelSimulator::~RenderModelSimulator() {
|
| }
|
|
|
| -RenderModelSimulator* ConstructSimulationModel(RenderModel model,
|
| - RenderNode* render_tree_root,
|
| - int window_width,
|
| - int window_height) {
|
| +std::unique_ptr<RenderModelSimulator> ConstructSimulationModel(
|
| + RenderModel model,
|
| + std::unique_ptr<RenderNode> render_tree_root,
|
| + int window_width,
|
| + int window_height) {
|
| switch (model) {
|
| case ForwardRenderModel:
|
| - return new ForwardRenderSimulator(render_tree_root,
|
| - window_width,
|
| - window_height);
|
| + return base::WrapUnique(new ForwardRenderSimulator(
|
| + std::move(render_tree_root), window_width, window_height));
|
| default:
|
| LOG(ERROR) << "Unrecognized render model. "
|
| "If we know its name, then it's..." << ModelToString(model);
|
| - return 0;
|
| + return nullptr;
|
| }
|
| }
|
| -
|
|
|