summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 17:15:14 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 17:15:14 +0000
commit88ea7b1eeb6717bb993025afa25e9f80e382e891 (patch)
tree833cfcbf5f0f52b2bb5361913de1aa3676af0f58 /chrome
parent0986c8dc481d431a43997a6323ae4b0a4354aff4 (diff)
downloadchromium_src-88ea7b1eeb6717bb993025afa25e9f80e382e891.zip
chromium_src-88ea7b1eeb6717bb993025afa25e9f80e382e891.tar.gz
chromium_src-88ea7b1eeb6717bb993025afa25e9f80e382e891.tar.bz2
Base coordinate system != Window base coordinate system. Marking things to be fixed.
BUG=http://crbug.com/36485 TEST=none; marking things to be fixed Review URL: http://codereview.chromium.org/661047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/chrome_browser_window.mm1
-rw-r--r--chrome/browser/cocoa/download_shelf_view.mm1
-rw-r--r--chrome/browser/cocoa/download_started_animation_mac.mm1
-rw-r--r--chrome/browser/cocoa/fullscreen_controller.mm2
-rw-r--r--chrome/browser/cocoa/hover_close_button.mm1
-rw-r--r--chrome/browser/cocoa/tab_strip_controller.mm1
-rw-r--r--chrome/browser/cocoa/tab_view.mm1
-rw-r--r--chrome/browser/cocoa/url_drop_target.mm2
-rw-r--r--chrome/browser/cocoa/web_drag_source.mm2
9 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/chrome_browser_window.mm b/chrome/browser/cocoa/chrome_browser_window.mm
index 897f6ac..4002cb7 100644
--- a/chrome/browser/cocoa/chrome_browser_window.mm
+++ b/chrome/browser/cocoa/chrome_browser_window.mm
@@ -285,6 +285,7 @@ namespace {
if (![self isMainWindow]) {
if ([event type] == NSLeftMouseDown) {
NSView* frameView = [self frameView];
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint mouse = [frameView convertPointFromBase:[event locationInWindow]];
if (NSPointInRect(mouse, [closeButton_ frame])) {
[closeButton_ mouseDown:event];
diff --git a/chrome/browser/cocoa/download_shelf_view.mm b/chrome/browser/cocoa/download_shelf_view.mm
index 15a13a2..521ff33 100644
--- a/chrome/browser/cocoa/download_shelf_view.mm
+++ b/chrome/browser/cocoa/download_shelf_view.mm
@@ -32,6 +32,7 @@
} else {
NSGradient* gradient = [theme gradientForStyle:GTMThemeStyleToolBar
state:isKey];
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint startPoint = [self convertPointFromBase:NSMakePoint(0, 0)];
NSPoint endPoint = [self convertPointFromBase:
NSMakePoint(0, [self frame].size.height)];
diff --git a/chrome/browser/cocoa/download_started_animation_mac.mm b/chrome/browser/cocoa/download_started_animation_mac.mm
index 37419c8..bbb9072 100644
--- a/chrome/browser/cocoa/download_started_animation_mac.mm
+++ b/chrome/browser/cocoa/download_started_animation_mac.mm
@@ -114,6 +114,7 @@ private:
}
NSPoint origin = [tabContentsView frame].origin;
+ // TODO(avi) http://crbug.com/36485; base != window
origin = [tabContentsView convertPointToBase:origin];
origin = [parentWindow convertBaseToScreen:origin];
diff --git a/chrome/browser/cocoa/fullscreen_controller.mm b/chrome/browser/cocoa/fullscreen_controller.mm
index d9a868d..2b06d1a 100644
--- a/chrome/browser/cocoa/fullscreen_controller.mm
+++ b/chrome/browser/cocoa/fullscreen_controller.mm
@@ -225,6 +225,7 @@ const CGFloat kTabStripVerticalOffset = 14;
return;
NSWindow* window = [browserController_ window];
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint mouseLoc =
[contentView_ convertPointFromBase:
[window mouseLocationOutsideOfEventStream]];
@@ -432,6 +433,7 @@ const CGFloat kTabStripVerticalOffset = 14;
- (BOOL)mouseInsideTrackingRect {
NSWindow* window = [browserController_ window];
NSPoint mouseLoc = [window mouseLocationOutsideOfEventStream];
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint mousePos = [contentView_ convertPointFromBase:mouseLoc];
return NSMouseInRect(mousePos, trackingAreaBounds_, [contentView_ isFlipped]);
}
diff --git a/chrome/browser/cocoa/hover_close_button.mm b/chrome/browser/cocoa/hover_close_button.mm
index ad32243..9ca08d7 100644
--- a/chrome/browser/cocoa/hover_close_button.mm
+++ b/chrome/browser/cocoa/hover_close_button.mm
@@ -103,6 +103,7 @@ const NSString* kPressedImageString = @"close_bar_p.pdf";
if (closeTrackingArea_.get()) {
// Update the close buttons if the tab has moved.
NSPoint mouseLoc = [[self window] mouseLocationOutsideOfEventStream];
+ // TODO(avi) http://crbug.com/36485; base != window
mouseLoc = [self convertPointFromBase:mouseLoc];
NSString* name = NSPointInRect(mouseLoc, [self bounds]) ?
kHoverImageString : kNormalImageString;
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 3b0617c..029bdb7 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -344,6 +344,7 @@ private:
// enable the tracking areas. Otherwise we won't get hover states
// or tab gradients if we load the window up under the mouse.
NSPoint mouseLoc = [[view window] mouseLocationOutsideOfEventStream];
+ // TODO(avi) http://crbug.com/36485; base != window
mouseLoc = [view convertPointFromBase:mouseLoc];
if (NSPointInRect(mouseLoc, [view bounds])) {
[self setTabTrackingAreasEnabled:YES];
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index c5dfd2a..1b5528f 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -495,6 +495,7 @@ const CGFloat kRapidCloseDist = 2.5;
TabView* draggedTabView = (TabView*)[draggedController_ selectedTabView];
NSRect tabFrame = [draggedTabView frame];
tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];
+ // TODO(avi) http://crbug.com/36485; base != window
tabFrame.origin = [[targetController_ window]
convertScreenToBase:tabFrame.origin];
tabFrame = [[targetController_ tabStripView]
diff --git a/chrome/browser/cocoa/url_drop_target.mm b/chrome/browser/cocoa/url_drop_target.mm
index d21cd67..3d3c000 100644
--- a/chrome/browser/cocoa/url_drop_target.mm
+++ b/chrome/browser/cocoa/url_drop_target.mm
@@ -44,6 +44,7 @@
NSDragOperation dragOp = [self getDragOperation:sender];
if (dragOp == NSDragOperationCopy) {
// Just tell the window controller to update the indicator.
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint hoverPoint = [view_ convertPointFromBase:[sender draggingLocation]];
[[view_ urlDropController] indicateDropURLsInView:view_ at:hoverPoint];
}
@@ -65,6 +66,7 @@
if ([urls count]) {
// Tell the window controller about the dropped URL(s).
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint dropPoint =
[view_ convertPointFromBase:[sender draggingLocation]];
[[view_ urlDropController] dropURLs:urls inView:view_ at:dropPoint];
diff --git a/chrome/browser/cocoa/web_drag_source.mm b/chrome/browser/cocoa/web_drag_source.mm
index 1408db9..1345e10 100644
--- a/chrome/browser/cocoa/web_drag_source.mm
+++ b/chrome/browser/cocoa/web_drag_source.mm
@@ -233,6 +233,7 @@ void PromiseWriterTask::Run() {
rvh->DragSourceSystemDragEnded();
// Convert |screenPoint| to view coordinates and flip it.
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint localPoint = [contentsView_ convertPointFromBase:screenPoint];
NSRect viewFrame = [contentsView_ frame];
localPoint.y = viewFrame.size.height - localPoint.y;
@@ -253,6 +254,7 @@ void PromiseWriterTask::Run() {
RenderViewHost* rvh = [contentsView_ tabContents]->render_view_host();
if (rvh) {
// Convert |screenPoint| to view coordinates and flip it.
+ // TODO(avi) http://crbug.com/36485; base != window
NSPoint localPoint = [contentsView_ convertPointFromBase:screenPoint];
NSRect viewFrame = [contentsView_ frame];
localPoint.y = viewFrame.size.height - localPoint.y;