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

Side by Side Diff: content/renderer/render_widget_fullscreen.cc

Issue 1245863003: Initialize CompositorDependencies in RenderWidget's constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 (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 #include "content/renderer/render_widget_fullscreen.h" 5 #include "content/renderer/render_widget_fullscreen.h"
6 6
7 #include "content/common/view_messages.h" 7 #include "content/common/view_messages.h"
8 #include "third_party/WebKit/public/web/WebWidget.h" 8 #include "third_party/WebKit/public/web/WebWidget.h"
9 9
10 using blink::WebWidget; 10 using blink::WebWidget;
11 11
12 namespace content { 12 namespace content {
13 13
14 void RenderWidgetFullscreen::show(blink::WebNavigationPolicy) { 14 void RenderWidgetFullscreen::show(blink::WebNavigationPolicy) {
15 DCHECK(!did_show_) << "received extraneous Show call"; 15 DCHECK(!did_show_) << "received extraneous Show call";
16 DCHECK_NE(MSG_ROUTING_NONE, routing_id_); 16 DCHECK_NE(MSG_ROUTING_NONE, routing_id_);
17 DCHECK_NE(MSG_ROUTING_NONE, opener_id_); 17 DCHECK_NE(MSG_ROUTING_NONE, opener_id_);
18 18
19 if (!did_show_) { 19 if (!did_show_) {
20 did_show_ = true; 20 did_show_ = true;
21 Send(new ViewHostMsg_ShowFullscreenWidget(opener_id_, routing_id_)); 21 Send(new ViewHostMsg_ShowFullscreenWidget(opener_id_, routing_id_));
22 SetPendingWindowRect(initial_rect_); 22 SetPendingWindowRect(initial_rect_);
23 } 23 }
24 } 24 }
25 25
26 RenderWidgetFullscreen::RenderWidgetFullscreen( 26 RenderWidgetFullscreen::RenderWidgetFullscreen(
27 CompositorDependencies* compositor_deps,
27 const blink::WebScreenInfo& screen_info) 28 const blink::WebScreenInfo& screen_info)
28 : RenderWidget(blink::WebPopupTypeNone, screen_info, false, false, false) {} 29 : RenderWidget(compositor_deps,
30 blink::WebPopupTypeNone,
31 screen_info,
32 false,
33 false,
34 false) {}
29 35
30 RenderWidgetFullscreen::~RenderWidgetFullscreen() {} 36 RenderWidgetFullscreen::~RenderWidgetFullscreen() {}
31 37
32 WebWidget* RenderWidgetFullscreen::CreateWebWidget() { 38 WebWidget* RenderWidgetFullscreen::CreateWebWidget() {
33 // TODO(boliu): Handle full screen render widgets here. 39 // TODO(boliu): Handle full screen render widgets here.
34 return RenderWidget::CreateWebWidget(this); 40 return RenderWidget::CreateWebWidget(this);
35 } 41 }
36 42
37 bool RenderWidgetFullscreen::Init(int32 opener_id, 43 bool RenderWidgetFullscreen::Init(int32 opener_id) {
38 CompositorDependencies* compositor_deps) {
39 DCHECK(!webwidget_); 44 DCHECK(!webwidget_);
40 45
41 return RenderWidget::DoInit(opener_id, compositor_deps, CreateWebWidget(), 46 return RenderWidget::DoInit(opener_id, CreateWebWidget(),
42 new ViewHostMsg_CreateFullscreenWidget( 47 new ViewHostMsg_CreateFullscreenWidget(
43 opener_id, &routing_id_, &surface_id_)); 48 opener_id, &routing_id_, &surface_id_));
44 } 49 }
45 50
46 } // namespace content 51 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698