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

Unified Diff: content/renderer/render_view_impl.cc

Issue 9302022: WebWidgetClient::screenInfo() no longer does a synchronous IPC. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed broken Windows build on last iteration. Thank you commit queue/trybots :) Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3c4812913f5f8685caa2ebe652c588cc93a9713f..ebc702687a020d3d4b35b0020b20dfd47a577f2e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -418,8 +418,9 @@ RenderViewImpl::RenderViewImpl(
int32 surface_id,
int64 session_storage_namespace_id,
const string16& frame_name,
- int32 next_page_id)
- : RenderWidget(WebKit::WebPopupTypeNone),
+ int32 next_page_id,
+ const WebKit::WebScreenInfo& screen_info)
+ : RenderWidget(WebKit::WebPopupTypeNone, screen_info),
webkit_preferences_(webkit_prefs),
send_content_state_immediately_(false),
enabled_bindings_(0),
@@ -620,7 +621,8 @@ RenderViewImpl* RenderViewImpl::Create(
int32 surface_id,
int64 session_storage_namespace_id,
const string16& frame_name,
- int32 next_page_id) {
+ int32 next_page_id,
+ const WebKit::WebScreenInfo& screen_info) {
DCHECK(routing_id != MSG_ROUTING_NONE);
return new RenderViewImpl(
parent_hwnd,
@@ -632,7 +634,8 @@ RenderViewImpl* RenderViewImpl::Create(
surface_id,
session_storage_namespace_id,
frame_name,
- next_page_id); // adds reference
+ next_page_id,
+ screen_info);
}
WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
@@ -1471,7 +1474,8 @@ WebView* RenderViewImpl::createView(
surface_id,
cloned_session_storage_namespace_id,
frame_name,
- 1);
+ 1,
+ screen_info_);
view->opened_by_user_gesture_ = params.user_gesture;
// Record whether the creator frame is trying to suppress the opener field.
@@ -1491,7 +1495,8 @@ WebView* RenderViewImpl::createView(
}
WebWidget* RenderViewImpl::createPopupMenu(WebKit::WebPopupType popup_type) {
- RenderWidget* widget = RenderWidget::Create(routing_id_, popup_type);
+ RenderWidget* widget =
+ RenderWidget::Create(routing_id_, popup_type, screen_info_);
return widget->webwidget();
}
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698