| Index: content/browser/renderer_host/render_widget_host_view_android.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
|
| index 0c69b8180abbdbbff5eebb232ea0bd830ac3880b..d92ca4005dbd0c54dc1258b87a4857ce013d1176 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.h
|
| @@ -21,9 +21,9 @@
|
| #include "cc/input/selection.h"
|
| #include "cc/output/begin_frame_args.h"
|
| #include "cc/scheduler/begin_frame_source.h"
|
| +#include "components/display_compositor/delegated_frame_evictor.h"
|
| #include "content/browser/accessibility/browser_accessibility_manager.h"
|
| #include "content/browser/android/content_view_core_impl_observer.h"
|
| -#include "content/browser/renderer_host/delegated_frame_evictor.h"
|
| #include "content/browser/renderer_host/input/stylus_text_selector.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| #include "content/browser/renderer_host/text_input_manager.h"
|
| @@ -64,7 +64,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| public ui::GestureProviderClient,
|
| public ui::ViewClient,
|
| public ui::WindowAndroidObserver,
|
| - public DelegatedFrameEvictorClient,
|
| + public display_compositor::DelegatedFrameEvictorClient,
|
| public StylusTextSelectorClient,
|
| public ui::TouchSelectionControllerClient,
|
| public content::ContentViewCoreImplObserver,
|
| @@ -187,7 +187,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| void OnAttachedToWindow() override;
|
| void OnDetachedFromWindow() override;
|
|
|
| - // DelegatedFrameEvictor implementation
|
| + // display_compositor::DelegatedFrameEvictor implementation
|
| void EvictDelegatedFrame() override;
|
|
|
| // StylusTextSelectorClient implementation.
|
| @@ -389,7 +389,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
|
|
| SynchronousCompositorClient* synchronous_compositor_client_;
|
|
|
| - std::unique_ptr<DelegatedFrameEvictor> frame_evictor_;
|
| + std::unique_ptr<display_compositor::DelegatedFrameEvictor> frame_evictor_;
|
|
|
| bool observing_root_window_;
|
|
|
|
|