content/browser/web_contents/web_contents_view_mac.mm - Issue 1777483005: Prepare content/ module for compilation with OS X 10.7 deployment target.

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/web_contents/web_contents_view_mac.mm

Issue 1777483005: Prepare content/ module for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp89_107_ui

Patch Set: Fix bugs. Created 4 years, 9 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/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | content/browser/web_contents/web_drag_dest_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_mac.mm

diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm

index 5d079a58b01e6d9a706a13cee21c16400e424f37..da315745e62461a525c65a876da17f09081a1069 100644

--- a/content/browser/web_contents/web_contents_view_mac.mm

+++ b/content/browser/web_contents/web_contents_view_mac.mm

@@ -118,13 +118,15 @@ gfx::NativeWindow WebContentsViewMac::GetTopLevelNativeWindow() const {

}

void WebContentsViewMac::GetContainerBounds(gfx::Rect* out) const {

- // Convert bounds to window coordinate space.

- NSRect bounds =

- [cocoa_view_.get() convertRect:[cocoa_view_.get() bounds] toView:nil];

- // Convert bounds to screen coordinate space.

NSWindow* window = [cocoa_view_.get() window];

- bounds.origin = [window convertBaseToScreen:bounds.origin];

+ NSRect bounds = [cocoa_view_.get() bounds];

+ if (window) {

+ // Convert bounds to window coordinate space.

+ bounds = [cocoa_view_.get() convertRect:bounds toView:nil];

+ // Convert bounds to screen coordinate space.

+ bounds = [window convertRectToScreen:bounds];

+ }

// Flip y to account for screen flip.

NSScreen* screen = [[NSScreen screens] firstObject];