Index: content/browser/android/synchronous_compositor_browser_filter.h |
diff --git a/content/browser/android/synchronous_compositor_browser_filter.h b/content/browser/android/synchronous_compositor_browser_filter.h |
index bd40f5e053190587fdfdf6078233cc49bc486f57..25cfd56e227102570326f9e8b6e48b4019def0d9 100644 |
--- a/content/browser/android/synchronous_compositor_browser_filter.h |
+++ b/content/browser/android/synchronous_compositor_browser_filter.h |
@@ -11,7 +11,9 @@ |
#include "base/macros.h" |
#include "base/synchronization/lock.h" |
+#include "cc/output/begin_frame_args.h" |
#include "cc/output/compositor_frame_metadata.h" |
+#include "cc/scheduler/begin_frame_source.h" |
#include "content/public/browser/android/synchronous_compositor.h" |
#include "content/public/browser/browser_message_filter.h" |
#include "ui/android/window_android_observer.h" |
@@ -25,20 +27,15 @@ namespace content { |
class RenderProcessHost; |
class SynchronousCompositorHost; |
-class SynchronousCompositorBrowserFilter : public ui::WindowAndroidObserver, |
+class SynchronousCompositorBrowserFilter : public cc::BeginFrameObserver, |
public BrowserMessageFilter { |
public: |
explicit SynchronousCompositorBrowserFilter(int process_id); |
- // WindowAndroidObserver overrides. |
- void OnCompositingDidCommit() override; |
- void OnRootWindowVisibilityChanged(bool visible) override; |
- void OnAttachCompositor() override; |
- void OnDetachCompositor() override; |
- void OnVSync(base::TimeTicks frame_time, |
- base::TimeDelta vsync_period) override; |
- void OnActivityStopped() override; |
- void OnActivityStarted() override; |
+ // cc::BeginFrameObserver overrides. |
+ void OnBeginFrame(const cc::BeginFrameArgs& args) override; |
+ const cc::BeginFrameArgs& LastUsedBeginFrameArgs() const override; |
+ void OnBeginFrameSourcePausedChanged(bool paused) override; |
// BrowserMessageFilter overrides. |
bool OnMessageReceived(const IPC::Message& message) override; |
@@ -70,6 +67,7 @@ class SynchronousCompositorBrowserFilter : public ui::WindowAndroidObserver, |
ui::WindowAndroid* window_android_in_vsync_ = nullptr; |
std::vector<SynchronousCompositorHost*> |
compositor_host_pending_renderer_state_; |
+ cc::BeginFrameArgs last_used_begin_frame_args_; |
// Only accessed on the UI thread. Note this is not a parallel map to |
// |future_map_|. |