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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 2484793002: Remove access to WebContents in RWHVA::SynchronousFrameMetadata() (Closed)
Patch Set: Created 4 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
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 10f335fe030b39206231da383cf90b5ffeed12ea..2e43a03860bc41790da122892f837db88a33ec78 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -25,6 +25,7 @@
#include "content/browser/renderer_host/delegated_frame_evictor.h"
#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/renderer_host/input/stylus_text_selector.h"
+#include "content/browser/renderer_host/render_widget_host_view_android_delegate.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/content_export.h"
#include "content/public/browser/readback_types.h"
@@ -77,8 +78,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
public ui::TouchSelectionControllerClient,
public content::ContentViewCoreImplObserver {
public:
- RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
- ContentViewCoreImpl* content_view_core);
+ RenderWidgetHostViewAndroid(
+ RenderWidgetHostImpl* widget,
+ ContentViewCoreImpl* content_view_core,
+ RenderWidgetHostViewAndroidDelegate* delegate);
~RenderWidgetHostViewAndroid() override;
void Blur();
@@ -353,6 +356,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
std::unique_ptr<DelegatedFrameEvictor> frame_evictor_;
+ std::unique_ptr<RenderWidgetHostViewAndroidDelegate> delegate_;
+
size_t locks_on_frame_count_;
bool observing_root_window_;

Powered by Google App Engine
This is Rietveld 408576698