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

Side by Side Diff: content/renderer/render_widget.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 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_RENDERER_RENDER_WIDGET_H_ 5 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
6 #define CONTENT_RENDERER_RENDER_WIDGET_H_ 6 #define CONTENT_RENDERER_RENDER_WIDGET_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 const blink::WebScreenInfo& screen_info); 115 const blink::WebScreenInfo& screen_info);
116 116
117 // Creates a new RenderWidget that will be attached to a RenderFrame. 117 // Creates a new RenderWidget that will be attached to a RenderFrame.
118 static RenderWidget* CreateForFrame(int routing_id, 118 static RenderWidget* CreateForFrame(int routing_id,
119 bool hidden, 119 bool hidden,
120 const blink::WebScreenInfo& screen_info, 120 const blink::WebScreenInfo& screen_info,
121 CompositorDependencies* compositor_deps, 121 CompositorDependencies* compositor_deps,
122 blink::WebLocalFrame* frame); 122 blink::WebLocalFrame* frame);
123 123
124 // Closes a RenderWidget that was created by |CreateForFrame|. 124 // Closes a RenderWidget that was created by |CreateForFrame|.
125 void CloseForFrame(); 125 // TODO(avi): De-virtualize this once RenderViewImpl has-a RenderWidget.
126 // https://crbug.com/545684
127 virtual void CloseForFrame();
126 128
127 int32 routing_id() const { return routing_id_; } 129 int32 routing_id() const { return routing_id_; }
128 CompositorDependencies* compositor_deps() const { return compositor_deps_; } 130 CompositorDependencies* compositor_deps() const { return compositor_deps_; }
129 blink::WebWidget* webwidget() const { return webwidget_; } 131 blink::WebWidget* webwidget() const { return webwidget_; }
130 gfx::Size size() const { return size_; } 132 gfx::Size size() const { return size_; }
131 bool is_fullscreen_granted() const { return is_fullscreen_granted_; } 133 bool is_fullscreen_granted() const { return is_fullscreen_granted_; }
132 blink::WebDisplayMode display_mode() const { return display_mode_; } 134 blink::WebDisplayMode display_mode() const { return display_mode_; }
133 bool is_hidden() const { return is_hidden_; } 135 bool is_hidden() const { return is_hidden_; }
134 bool handling_input_event() const { return handling_input_event_; } 136 bool handling_input_event() const { return handling_input_event_; }
135 // Temporary for debugging purposes... 137 // Temporary for debugging purposes...
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 797
796 scoped_ptr<scheduler::RenderWidgetSchedulingState> 798 scoped_ptr<scheduler::RenderWidgetSchedulingState>
797 render_widget_scheduling_state_; 799 render_widget_scheduling_state_;
798 800
799 DISALLOW_COPY_AND_ASSIGN(RenderWidget); 801 DISALLOW_COPY_AND_ASSIGN(RenderWidget);
800 }; 802 };
801 803
802 } // namespace content 804 } // namespace content
803 805
804 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_ 806 #endif // CONTENT_RENDERER_RENDER_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698