| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index c9ad47563b71cf2d2d53fa46a9359edaf3694e43..bd6d4d8e776a849636600ae0a2fe7ee6cc3a70cd 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -20,6 +20,7 @@
|
| #include "cc/layers/layer.h"
|
| #include "cc/output/begin_frame_args.h"
|
| #include "cc/output/context_provider.h"
|
| +#include "cc/scheduler/begin_frame_source.h"
|
| #include "cc/surfaces/surface_id_allocator.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| @@ -65,8 +66,6 @@ void CompositorLock::CancelLock() {
|
|
|
| } // namespace ui
|
|
|
| -namespace {} // namespace
|
| -
|
| namespace ui {
|
|
|
| class SatisfySwapPromise : public cc::SwapPromise {
|
| @@ -168,7 +167,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 +176,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);
|
|
|