Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: ui/compositor/compositor.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/valgrind/memcheck/suppressions_mac.txt ('k') | ui/compositor/float_animation_curve_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index c9ad47563b71cf2d2d53fa46a9359edaf3694e43..6bcb02a6f0b0e1373fbc79eff53ebd95dcc4a625 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -18,6 +18,7 @@
#include "cc/base/switches.h"
#include "cc/input/input_handler.h"
#include "cc/layers/layer.h"
+#include "cc/scheduler/begin_frame_source.h"
#include "cc/output/begin_frame_args.h"
#include "cc/output/context_provider.h"
#include "cc/surfaces/surface_id_allocator.h"
@@ -168,7 +169,8 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
context_factory_->GetGpuMemoryBufferManager(),
settings,
task_runner_,
- compositor_thread_loop_);
+ compositor_thread_loop_,
+ nullptr);
} else {
host_ = cc::LayerTreeHost::CreateSingleThreaded(
this,
@@ -176,7 +178,8 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
context_factory_->GetSharedBitmapManager(),
context_factory_->GetGpuMemoryBufferManager(),
settings,
- task_runner_);
+ task_runner_,
+ nullptr);
}
UMA_HISTOGRAM_TIMES("GPU.CreateBrowserCompositor",
base::TimeTicks::Now() - before_create);
« no previous file with comments | « tools/valgrind/memcheck/suppressions_mac.txt ('k') | ui/compositor/float_animation_curve_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698