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

Unified Diff: chrome/browser/renderer_host/resource_message_filter_mac.mm

Issue 67145: Linux: move X operations from the IO to UI2 thread. (Closed)
Patch Set: ... Created 11 years, 8 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: chrome/browser/renderer_host/resource_message_filter_mac.mm
diff --git a/chrome/browser/renderer_host/resource_message_filter_mac.mm b/chrome/browser/renderer_host/resource_message_filter_mac.mm
index c4b7531e8410402303fbaae26dfd669f521103c4..7d740ac7c9b4ef7cbbec7e3d70d0d6d40744fe4a 100644
--- a/chrome/browser/renderer_host/resource_message_filter_mac.mm
+++ b/chrome/browser/renderer_host/resource_message_filter_mac.mm
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/renderer_host/resource_message_filter.h"
+#include "chrome/common/render_messages.h"
#import <Cocoa/Cocoa.h>
@@ -23,28 +24,31 @@ gfx::Rect NSRectToRect(const NSRect rect, NSScreen* screen) {
// http://crbug.com/9060 for more details.
void ResourceMessageFilter::OnGetWindowRect(gfx::NativeViewId window_id,
- gfx::Rect* rect) {
+ IPC::Message* reply_msg) {
NSView* view = gfx::NativeViewFromId(window_id);
- if (!view) {
- *rect = gfx::Rect();
- return;
+ gfx::Rect rect;
+
+ if (view) {
+ NSRect bounds = [view bounds];
+ bounds = [view convertRect:bounds toView:nil];
+ bounds.origin = [[view window] convertBaseToScreen:bounds.origin];
+ rect = NSRectToRect(bounds, [[view window] screen]);
}
- NSRect bounds = [view bounds];
- bounds = [view convertRect:bounds toView:nil];
- bounds.origin = [[view window] convertBaseToScreen:bounds.origin];
- *rect = NSRectToRect(bounds, [[view window] screen]);
+ ViewHostMsg_GetWindowRect::WriteReplyParams(reply_msg, rect);
+ Send(reply_msg);
}
void ResourceMessageFilter::OnGetRootWindowRect(gfx::NativeViewId window_id,
- gfx::Rect* rect) {
+ IPC::Message* reply_msg) {
NSView* view = gfx::NativeViewFromId(window_id);
- if (!view) {
- *rect = gfx::Rect();
- return;
+ gfx::Rect rect;
+ if (view) {
+ NSWindow* window = [view window];
+ NSRect bounds = [window frame];
+ gfx::Rect rect = NSRectToRect(bounds, [window screen]);
}
- NSWindow* window = [view window];
- NSRect bounds = [window frame];
- *rect = NSRectToRect(bounds, [window screen]);
+ ViewHostMsg_GetRootWindowRect::WriteReplyParams(reply_msg, rect);
+ Send(reply_msg);
}

Powered by Google App Engine
This is Rietveld 408576698