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

Unified Diff: ui/compositor/compositor.cc

Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 04763a64857ac1de0bb57f8f7e7db99fb9871103..1f8febed5f211337880bfc422abc3417466e6360 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);
« ipc/ipc_forwarding_message_filter.h ('K') | « mojo/services/html_viewer/weblayertreeview_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698