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

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

Issue 2496633004: Revert of RenderWidget: hoist synchronous IPC out of Init methods. (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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_widget_fullscreen.h ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/render_thread_impl.h" 8 #include "content/renderer/render_thread_impl.h"
9 #include "third_party/WebKit/public/web/WebWidget.h" 9 #include "third_party/WebKit/public/web/WebWidget.h"
10 10
(...skipping 23 matching lines...) Expand all
34 false, 34 false,
35 false) {} 35 false) {}
36 36
37 RenderWidgetFullscreen::~RenderWidgetFullscreen() {} 37 RenderWidgetFullscreen::~RenderWidgetFullscreen() {}
38 38
39 WebWidget* RenderWidgetFullscreen::CreateWebWidget() { 39 WebWidget* RenderWidgetFullscreen::CreateWebWidget() {
40 // TODO(boliu): Handle full screen render widgets here. 40 // TODO(boliu): Handle full screen render widgets here.
41 return RenderWidget::CreateWebWidget(this); 41 return RenderWidget::CreateWebWidget(this);
42 } 42 }
43 43
44 bool RenderWidgetFullscreen::CreateFullscreenWidget(int32_t opener_id,
45 int32_t* routing_id) {
46 RenderThreadImpl::current_render_message_filter()->CreateFullscreenWidget(
47 opener_id, routing_id);
48 return true;
49 }
50
44 bool RenderWidgetFullscreen::Init(int32_t opener_id) { 51 bool RenderWidgetFullscreen::Init(int32_t opener_id) {
45 DCHECK(!GetWebWidget()); 52 DCHECK(!GetWebWidget());
46 53
47 // Synchronous IPC to obtain a routing id for ourselves. 54 bool success = RenderWidget::DoInit(
48 int32_t routing_id = MSG_ROUTING_NONE; 55 opener_id, CreateWebWidget(),
49 if (!RenderThreadImpl::current_render_message_filter() 56 base::Bind(&RenderWidgetFullscreen::CreateFullscreenWidget,
50 ->CreateFullscreenWidget(opener_id, &routing_id)) { 57 base::Unretained(this), opener_id, &routing_id_));
51 return false; 58
59 if (success) {
60 // TODO(fsamuel): This is a bit ugly. The |create_widget_message| should
61 // probably be factored out of RenderWidget::DoInit.
62 SetRoutingID(routing_id_);
63 return true;
52 } 64 }
53 65 return false;
54 RenderWidget::InitRoutingID(routing_id);
55 RenderWidget::Init(opener_id, CreateWebWidget());
56 return true;
57 } 66 }
58 67
59 } // namespace content 68 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget_fullscreen.h ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698