summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 21:22:21 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 21:22:21 +0000
commitfb200c7fb1beb6e8248075b663a635bd32acac06 (patch)
tree3e9901eb6b3be755b959e3f69277aa55044a9a91 /content
parent8812588cf7a57f6fabc3e950797e3c48a23d3815 (diff)
downloadchromium_src-fb200c7fb1beb6e8248075b663a635bd32acac06.zip
chromium_src-fb200c7fb1beb6e8248075b663a635bd32acac06.tar.gz
chromium_src-fb200c7fb1beb6e8248075b663a635bd32acac06.tar.bz2
Workaround for failing Aura browser tests.
With r119520, many browser_tests started failing on GYP_DEFINES="use_aura=1 chromeos=1" builds. This works around the problem (cause still unknown). BUG=111929 TEST=Linux ChromeOS Aura bot goes green TBR=jamesr Review URL: https://chromiumcodereview.appspot.com/9264048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_widget.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 3d92096..2895623 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1506,8 +1506,15 @@ WebScreenInfo RenderWidget::screenInfo() {
WebScreenInfo results;
if (host_window_)
Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
- else
+ 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 = 1;
+ results.availableRect.height = 1;
+#endif
+ }
return results;
}