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

Unified Diff: content/renderer/render_widget.cc

Issue 9302022: WebWidgetClient::screenInfo() no longer does a synchronous IPC. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years, 11 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
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6527b3b24ecc692ae14d19a6869f707f9737494b..8739bfe4382a084b2da4a891a441e221b88aa630 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -68,7 +68,8 @@ using WebKit::WebVector;
using WebKit::WebWidget;
using content::RenderThread;
-RenderWidget::RenderWidget(WebKit::WebPopupType popup_type)
+RenderWidget::RenderWidget(WebKit::WebPopupType popup_type,
+ const WebKit::WebScreenInfo& screen_info)
: routing_id_(MSG_ROUTING_NONE),
surface_id_(0),
webwidget_(NULL),
@@ -97,7 +98,8 @@ RenderWidget::RenderWidget(WebKit::WebPopupType popup_type)
is_accelerated_compositing_active_(false),
animation_update_pending_(false),
animation_task_posted_(false),
- invalidation_task_posted_(false) {
+ invalidation_task_posted_(false),
+ screen_info_(screen_info) {
RenderProcess::current()->AddRefProcess();
DCHECK(RenderThread::Get());
has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
@@ -118,9 +120,11 @@ RenderWidget::~RenderWidget() {
// static
RenderWidget* RenderWidget::Create(int32 opener_id,
- WebKit::WebPopupType popup_type) {
+ WebKit::WebPopupType popup_type,
+ const WebKit::WebScreenInfo& screen_info) {
DCHECK(opener_id != MSG_ROUTING_NONE);
- scoped_refptr<RenderWidget> widget(new RenderWidget(popup_type));
+ scoped_refptr<RenderWidget> widget(
+ new RenderWidget(popup_type, screen_info));
widget->Init(opener_id); // adds reference
return widget;
}
@@ -1503,9 +1507,7 @@ bool RenderWidget::CanComposeInline() {
}
WebScreenInfo RenderWidget::screenInfo() {
- WebScreenInfo results;
- Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
- return results;
+ return screen_info_;
}
void RenderWidget::resetInputMethod() {

Powered by Google App Engine
This is Rietveld 408576698