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

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: Refreshed patch to merge with tip of tree 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
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index a981b6bc0ce34e9270c76c0e0bef6977b6a7b36a..15f5a96aed500df80ea741a2f617266054aee433 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -69,7 +69,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),
@@ -100,6 +101,7 @@ RenderWidget::RenderWidget(WebKit::WebPopupType popup_type)
animation_update_pending_(false),
animation_task_posted_(false),
invalidation_task_posted_(false),
+ screen_info_(screen_info),
invert_(false) {
RenderProcess::current()->AddRefProcess();
DCHECK(RenderThread::Get());
@@ -121,9 +123,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;
}
@@ -1589,19 +1593,7 @@ bool RenderWidget::CanComposeInline() {
}
WebScreenInfo RenderWidget::screenInfo() {
- WebScreenInfo results;
- if (host_window_set_)
- Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
jam 2012/02/29 23:41:17 this IPC, and the code that dispatches it, can now
Fady Samuel 2012/03/01 00:52:25 Done.
- else {
- DLOG(WARNING) << "Unable to retrieve screen information, no host window";
-#if defined(USE_AURA)
- // TODO(backer): Remove this a temporary workaround for crbug.com/111929
- // once we get a proper fix.
- results.availableRect.width = 1000;
- results.availableRect.height = 1000;
-#endif
- }
- return results;
+ return screen_info_;
}
void RenderWidget::resetInputMethod() {

Powered by Google App Engine
This is Rietveld 408576698