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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 1094113003: Allow out-of-process iframes to render to compositing surfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed one Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/resources/returned_resource.h"
10 #include "cc/surfaces/surface_factory_client.h"
11 #include "cc/surfaces/surface_id_allocator.h"
12 #include "content/browser/compositor/image_transport_factory.h"
9 #include "content/browser/renderer_host/render_widget_host_view_base.h" 13 #include "content/browser/renderer_host/render_widget_host_view_base.h"
10 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
11 #include "content/public/browser/readback_types.h" 15 #include "content/public/browser/readback_types.h"
16 #include "ui/compositor/compositor.h"
12 #include "ui/gfx/geometry/rect.h" 17 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/native_widget_types.h" 18 #include "ui/gfx/native_widget_types.h"
14 19
20 namespace cc {
21 class SurfaceFactory;
22 enum class SurfaceDrawStatus;
23 }
24
15 namespace content { 25 namespace content {
16 class CrossProcessFrameConnector; 26 class CrossProcessFrameConnector;
17 class RenderWidgetHost; 27 class RenderWidgetHost;
18 class RenderWidgetHostImpl; 28 class RenderWidgetHostImpl;
29 class RenderWidgetHostViewChildFrameTest;
19 30
20 // RenderWidgetHostViewChildFrame implements the view for a RenderWidgetHost 31 // RenderWidgetHostViewChildFrame implements the view for a RenderWidgetHost
21 // associated with content being rendered in a separate process from 32 // associated with content being rendered in a separate process from
22 // content that is embedding it. This is not a platform-specific class; rather, 33 // content that is embedding it. This is not a platform-specific class; rather,
23 // the embedding renderer process implements the platform containing the 34 // the embedding renderer process implements the platform containing the
24 // widget, and the top-level frame's RenderWidgetHostView will ultimately 35 // widget, and the top-level frame's RenderWidgetHostView will ultimately
25 // manage all native widget interaction. 36 // manage all native widget interaction.
26 // 37 //
27 // See comments in render_widget_host_view.h about this class and its members. 38 // See comments in render_widget_host_view.h about this class and its members.
28 class CONTENT_EXPORT RenderWidgetHostViewChildFrame 39 class CONTENT_EXPORT RenderWidgetHostViewChildFrame
29 : public RenderWidgetHostViewBase { 40 : public RenderWidgetHostViewBase,
41 public cc::SurfaceFactoryClient {
30 public: 42 public:
31 explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget); 43 explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget);
32 ~RenderWidgetHostViewChildFrame() override; 44 ~RenderWidgetHostViewChildFrame() override;
33 45
34 void set_cross_process_frame_connector( 46 void set_cross_process_frame_connector(
35 CrossProcessFrameConnector* frame_connector) { 47 CrossProcessFrameConnector* frame_connector) {
36 frame_connector_ = frame_connector; 48 frame_connector_ = frame_connector;
37 } 49 }
38 50
39 // RenderWidgetHostView implementation. 51 // RenderWidgetHostView implementation.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #endif // defined(OS_ANDROID) 138 #endif // defined(OS_ANDROID)
127 139
128 #if defined(OS_WIN) 140 #if defined(OS_WIN)
129 void SetParentNativeViewAccessible( 141 void SetParentNativeViewAccessible(
130 gfx::NativeViewAccessible accessible_parent) override; 142 gfx::NativeViewAccessible accessible_parent) override;
131 gfx::NativeViewId GetParentForWindowlessPlugin() const override; 143 gfx::NativeViewId GetParentForWindowlessPlugin() const override;
132 #endif 144 #endif
133 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 145 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
134 BrowserAccessibilityDelegate* delegate) override; 146 BrowserAccessibilityDelegate* delegate) override;
135 147
148 // cc::SurfaceFactoryClient implementation.
149 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
150
136 protected: 151 protected:
137 friend class RenderWidgetHostView; 152 friend class RenderWidgetHostView;
153 friend class RenderWidgetHostViewChildFrameTest;
154
155 void SurfaceDrawn(uint32 output_surface_id, cc::SurfaceDrawStatus drawn);
138 156
139 // The last scroll offset of the view. 157 // The last scroll offset of the view.
140 gfx::Vector2dF last_scroll_offset_; 158 gfx::Vector2dF last_scroll_offset_;
141 159
142 // Members will become private when RenderWidgetHostViewGuest is removed. 160 // Members will become private when RenderWidgetHostViewGuest is removed.
143 // The model object. 161 // The model object.
144 RenderWidgetHostImpl* host_; 162 RenderWidgetHostImpl* host_;
145 163
164 // Flag determining whether we render into a compositing Surface.
165 bool use_surfaces_;
166
167 // Surface-related state.
168 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_;
169 scoped_ptr<cc::SurfaceFactory> surface_factory_;
170 cc::SurfaceId surface_id_;
171 uint32 next_surface_sequence_;
172 uint32 last_output_surface_id_;
173 gfx::Size current_surface_size_;
174 float current_surface_scale_factor_;
175 uint32 ack_pending_count_;
176 cc::ReturnedResourceArray surface_returned_resources_;
177
146 // frame_connector_ provides a platform abstraction. Messages 178 // frame_connector_ provides a platform abstraction. Messages
147 // sent through it are routed to the embedding renderer process. 179 // sent through it are routed to the embedding renderer process.
148 CrossProcessFrameConnector* frame_connector_; 180 CrossProcessFrameConnector* frame_connector_;
149 181
150 private: 182 private:
183 base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() {
184 return weak_factory_.GetWeakPtr();
185 }
186
187 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
151 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 188 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
152 }; 189 };
153 190
154 } // namespace content 191 } // namespace content
155 192
156 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 193 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698