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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget_fullscreen.cc
diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc
index 4c494391427ac6497403dd34a16471994b6184f9..8576a007d83f6d0bfb424219c8f1849563595f42 100644
--- a/content/renderer/render_widget_fullscreen.cc
+++ b/content/renderer/render_widget_fullscreen.cc
@@ -41,19 +41,28 @@
return RenderWidget::CreateWebWidget(this);
}
+bool RenderWidgetFullscreen::CreateFullscreenWidget(int32_t opener_id,
+ int32_t* routing_id) {
+ RenderThreadImpl::current_render_message_filter()->CreateFullscreenWidget(
+ opener_id, routing_id);
+ return true;
+}
+
bool RenderWidgetFullscreen::Init(int32_t opener_id) {
DCHECK(!GetWebWidget());
- // Synchronous IPC to obtain a routing id for ourselves.
- int32_t routing_id = MSG_ROUTING_NONE;
- if (!RenderThreadImpl::current_render_message_filter()
- ->CreateFullscreenWidget(opener_id, &routing_id)) {
- return false;
+ bool success = RenderWidget::DoInit(
+ opener_id, CreateWebWidget(),
+ base::Bind(&RenderWidgetFullscreen::CreateFullscreenWidget,
+ base::Unretained(this), opener_id, &routing_id_));
+
+ if (success) {
+ // TODO(fsamuel): This is a bit ugly. The |create_widget_message| should
+ // probably be factored out of RenderWidget::DoInit.
+ SetRoutingID(routing_id_);
+ return true;
}
-
- RenderWidget::InitRoutingID(routing_id);
- RenderWidget::Init(opener_id, CreateWebWidget());
- return true;
+ return false;
}
} // namespace content
« 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