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

Side by Side Diff: content/browser/web_contents/web_contents_view_android.h

Issue 2484793002: Remove access to WebContents in RWHVA::SynchronousFrameMetadata() (Closed)
Patch Set: case-by-case 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 11 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
12 #include "content/browser/web_contents/web_contents_view.h" 12 #include "content/browser/web_contents/web_contents_view.h"
13 #include "content/public/browser/web_contents_view_delegate.h" 13 #include "content/public/browser/web_contents_view_delegate.h"
14 #include "content/public/common/context_menu_params.h" 14 #include "content/public/common/context_menu_params.h"
15 #include "content/public/common/drop_data.h" 15 #include "content/public/common/drop_data.h"
16 #include "ui/android/view_android.h" 16 #include "ui/android/view_android.h"
17 #include "ui/gfx/geometry/rect_f.h" 17 #include "ui/gfx/geometry/rect_f.h"
18 18
19 namespace content { 19 namespace content {
20 class ContentViewCoreImpl; 20 class ContentViewCoreImpl;
21 class RenderWidgetHostViewAndroid;
22 class SynchronousCompositorClient;
21 class WebContentsImpl; 23 class WebContentsImpl;
22 24
23 // Android-specific implementation of the WebContentsView. 25 // Android-specific implementation of the WebContentsView.
24 class WebContentsViewAndroid : public WebContentsView, 26 class WebContentsViewAndroid : public WebContentsView,
25 public RenderViewHostDelegateView { 27 public RenderViewHostDelegateView {
26 public: 28 public:
27 WebContentsViewAndroid(WebContentsImpl* web_contents, 29 WebContentsViewAndroid(WebContentsImpl* web_contents,
28 WebContentsViewDelegate* delegate); 30 WebContentsViewDelegate* delegate);
29 ~WebContentsViewAndroid() override; 31 ~WebContentsViewAndroid() override;
30 32
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 const gfx::Point& screen_location); 86 const gfx::Point& screen_location);
85 void OnDragUpdated(const gfx::Point& location, 87 void OnDragUpdated(const gfx::Point& location,
86 const gfx::Point& screen_location); 88 const gfx::Point& screen_location);
87 void OnDragExited(); 89 void OnDragExited();
88 void OnPerformDrop(DropData* drop_data, 90 void OnPerformDrop(DropData* drop_data,
89 const gfx::Point& location, 91 const gfx::Point& location,
90 const gfx::Point& screen_location); 92 const gfx::Point& screen_location);
91 void OnDragEnded(); 93 void OnDragEnded();
92 94
93 private: 95 private:
96 void SetSynchronousCompositorClientFor(RenderWidgetHostViewAndroid* rwhv);
97
94 // The WebContents whose contents we display. 98 // The WebContents whose contents we display.
95 WebContentsImpl* web_contents_; 99 WebContentsImpl* web_contents_;
96 100
97 // ContentViewCoreImpl is our interface to the view system. 101 // ContentViewCoreImpl is our interface to the view system.
98 ContentViewCoreImpl* content_view_core_; 102 ContentViewCoreImpl* content_view_core_;
99 103
100 // Interface for extensions to WebContentsView. Used to show the context menu. 104 // Interface for extensions to WebContentsView. Used to show the context menu.
101 std::unique_ptr<WebContentsViewDelegate> delegate_; 105 std::unique_ptr<WebContentsViewDelegate> delegate_;
102 106
103 // The native view associated with the contents of the web. 107 // The native view associated with the contents of the web.
104 ui::ViewAndroid view_; 108 ui::ViewAndroid view_;
105 109
106 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 110 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
107 }; 111 };
108 112
109 } // namespace content 113 } // namespace content
110 114
111 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 115 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698