content/browser/renderer_host/render_widget_host_view_aura.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tidy Created 8 years, 2 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

« ash/display/display_controller.cc ('K') | « content/browser/renderer_host/dip_util.cc ('k') | content/browser/renderer_host/render_widget_host_view_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc

index b5905bc84b14a805be1dc43187064e9e22a0845b..e05f629b3531916844b18f111f7c817fd765580d 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -147,7 +147,7 @@ bool CanRendererHandleEvent(const ui::MouseEvent* event) {

void GetScreenInfoForWindow(WebScreenInfo* results, aura::Window* window) {

const gfx::Display display = window ?

gfx::Screen::GetDisplayNearestWindow(window) :

- gfx::Screen::GetPrimaryDisplay();

+ gfx::Screen::GetPrimaryDisplay(gfx::Screen::BadTwoWorldsContext());

const gfx::Size size = display.size();

results->rect = WebKit::WebRect(0, 0, size.width(), size.height());

results->availableRect = results->rect;

@@ -1703,7 +1703,8 @@ RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {

}

void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {

- const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint();

+ const gfx::Point screen_point = gfx::Screen::GetCursorScreenPoint(

+ gfx::Screen::BadTwoWorldsContext());

aura::RootWindow* root_window = window_->GetRootWindow();

if (!root_window)

return;