summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-13 04:30:46 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-13 04:30:46 +0000
commit58d0043fd3f9d3e448ec3fd613c7f566ca73e482 (patch)
tree94df001e05072d7bb20837c0f32272c2129868d4
parentdaa29386025fdea4ca860dcc1bcb645d84471fb5 (diff)
downloadchromium_src-58d0043fd3f9d3e448ec3fd613c7f566ca73e482.zip
chromium_src-58d0043fd3f9d3e448ec3fd613c7f566ca73e482.tar.gz
chromium_src-58d0043fd3f9d3e448ec3fd613c7f566ca73e482.tar.bz2
[OSX] Cleanup - Use NSZeroPoint if possible.
By convention, we prefer NSZeroPoint over an explicit invocation of NSMakePoint(0, 0). Minor cleanup, using a script: find . -name '*.mm' -exec sed -i'' -e 's/NSMakePoint(0,[[:space:]]*0)/NSZeroPoint/g' {} \; TBR=darin@chromium.org R=shess@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/18856016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211541 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/message_loop/message_pump_mac.mm2
-rw-r--r--chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm2
-rw-r--r--chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm2
-rw-r--r--chrome/browser/ui/cocoa/chrome_browser_window.mm2
-rw-r--r--chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm2
-rw-r--r--chrome/browser/ui/cocoa/framed_browser_window.mm4
-rw-r--r--chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm10
-rw-r--r--content/browser/accessibility/browser_accessibility_mac_unittest.mm2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.mm4
-rw-r--r--content/browser/web_contents/web_drag_source_mac.mm4
-rw-r--r--content/browser/web_contents/web_drag_source_mac_unittest.mm2
-rw-r--r--content/renderer/render_view_browsertest_mac.mm2
-rw-r--r--ui/base/test/cocoa_test_event_utils.mm2
-rw-r--r--ui/base/test/ui_controls_mac.mm2
-rw-r--r--webkit/plugins/npapi/plugin_instance_mac.mm2
20 files changed, 27 insertions, 27 deletions
diff --git a/base/message_loop/message_pump_mac.mm b/base/message_loop/message_pump_mac.mm
index 957d3e9..f46d7a8 100644
--- a/base/message_loop/message_pump_mac.mm
+++ b/base/message_loop/message_pump_mac.mm
@@ -602,7 +602,7 @@ void MessagePumpNSApplication::Quit() {
// Send a fake event to wake the loop up.
[NSApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:0
timestamp:0
windowNumber:0
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
index f6fecf0..63b5cde 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm
@@ -229,7 +229,7 @@ void AutofillDialogCocoa::OnConstrainedWindowClosed(
[mainContainer_ setAnchorView:[[accountChooser_ subviews] objectAtIndex:1]];
NSRect contentRect = clientRect;
- contentRect.origin = NSMakePoint(0, 0);
+ contentRect.origin = NSZeroPoint;
contentRect.size.width += 2 * chrome_style::kHorizontalPadding;
contentRect.size.height += NSHeight(headerRect) +
chrome_style::kClientBottomPadding +
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm
index 8cad9d7..9f9d6fe 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm
@@ -25,7 +25,7 @@ class AutofillSectionViewTest : public ui::CocoaTest {
NSEvent* fakeEvent(NSEventType type) {
return [NSEvent enterExitEventWithType:type
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:0
timestamp:0
windowNumber:[[view_ window] windowNumber]
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index b654f44..9ae2499 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -1046,7 +1046,7 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
EXPECT_NSEQ(@"a", [[[bar_ buttons] objectAtIndex:0] title]);
[bar_ dragButton:[[bar_ buttons] objectAtIndex:2]
- to:NSMakePoint(0, 0)
+ to:NSZeroPoint
copy:NO];
EXPECT_NSEQ(@"c", [[[bar_ buttons] objectAtIndex:0] title]);
// Make sure a 'copy' did not happen.
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index 60835d6..137451a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -845,7 +845,7 @@ struct LayoutMetrics {
// more items) using the keyboard, the scroll view seems to want to be
// offset by default: [ http://crbug.com/101099 ]. Explicitly reseting the
// scroll position here is a bit hacky, but it does seem to work.
- [[scrollView_ contentView] scrollToPoint:NSMakePoint(0, 0)];
+ [[scrollView_ contentView] scrollToPoint:NSZeroPoint];
NSSize newSize = NSMakeSize(windowWidth, 0.0);
[self adjustWindowLeft:newWindowTopLeft.x size:newSize scrollingBy:0.0];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
index c69a17d..49eecdf 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm
@@ -116,7 +116,7 @@ NSImage* DragImageForBookmark(NSImage* favicon, const string16& title) {
NSImage* drag_image =
[[[NSImage alloc] initWithSize:drag_image_size] autorelease];
[drag_image lockFocus];
- [favicon drawAtPoint:NSMakePoint(0, 0)
+ [favicon drawAtPoint:NSZeroPoint
fromRect:NSZeroRect
operation:NSCompositeSourceOver
fraction:0.7];
diff --git a/chrome/browser/ui/cocoa/chrome_browser_window.mm b/chrome/browser/ui/cocoa/chrome_browser_window.mm
index b0f03d6..24e2623 100644
--- a/chrome/browser/ui/cocoa/chrome_browser_window.mm
+++ b/chrome/browser/ui/cocoa/chrome_browser_window.mm
@@ -27,7 +27,7 @@
- (NSPoint)themePatternPhase {
id delegate = [self delegate];
if (![delegate respondsToSelector:@selector(themePatternPhase)])
- return NSMakePoint(0, 0);
+ return NSZeroPoint;
return [delegate themePatternPhase];
}
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index 6fcb98f..3b11b08 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -295,7 +295,7 @@ const float kRightEdgeOffset = 25;
// Animate the view into place.
NSRect frame = [findBarView_ frame];
- frame.origin = NSMakePoint(0, 0);
+ frame.origin = NSZeroPoint;
[self setFindBarFrame:frame animate:animate duration:kFindBarOpenDuration];
}
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm
index a868fa0..5e39839 100644
--- a/chrome/browser/ui/cocoa/framed_browser_window.mm
+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm
@@ -339,7 +339,7 @@ const CGFloat kWindowGradientHeight = 24.0;
// Only paint the top of the window.
NSRect windowRect = [view convertRect:[self frame] fromView:nil];
- windowRect.origin = NSMakePoint(0, 0);
+ windowRect.origin = NSZeroPoint;
NSRect paintRect = windowRect;
paintRect.origin.y = NSMaxY(paintRect) - kBrowserFrameViewPaintHeight;
@@ -378,7 +378,7 @@ const CGFloat kWindowGradientHeight = 24.0;
CGFloat lineWidth = [view cr_lineWidth];
windowRect = [view convertRect:[self frame] fromView:nil];
- windowRect.origin = NSMakePoint(0, 0);
+ windowRect.origin = NSZeroPoint;
windowRect.origin.y -= 0.5 * lineWidth;
windowRect.origin.x -= 0.5 * lineWidth;
windowRect.size.width += lineWidth;
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
index d02f806..e16feab 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
@@ -34,7 +34,7 @@
- (id)initWithWindow:(NSWindow*)window {
if ((self = [super init])) {
window_ = window;
- baseFrameOffset_ = NSMakePoint(0, 0);
+ baseFrameOffset_ = NSZeroPoint;
}
return self;
}
diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
index ad24ca7..0267e79 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm
@@ -182,7 +182,7 @@ TEST_F(TabControllerTest, UserSelection) {
[[window contentView] addSubview:[controller view]];
NSRect frame = [[controller view] frame];
frame.size.width = [TabController minTabWidth];
- frame.origin = NSMakePoint(0, 0);
+ frame.origin = NSZeroPoint;
[[controller view] setFrame:frame];
// Set the target and action.
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index cf230d1..84cb900 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -188,7 +188,7 @@ TEST_F(TabStripControllerTest, CorrectToolTipText) {
// Check that there's no tooltip yet.
EXPECT_FALSE([controller_ view:nil
stringForToolTip:nil
- point:NSMakePoint(0,0)
+ point:NSZeroPoint
userData:nil]);
// Set up mouse event on overlap of tab1 + tab2.
@@ -202,7 +202,7 @@ TEST_F(TabStripControllerTest, CorrectToolTipText) {
EXPECT_STREQ("Tab2",
[[controller_ view:nil
stringForToolTip:nil
- point:NSMakePoint(0,0)
+ point:NSZeroPoint
userData:nil] cStringUsingEncoding:NSASCIIStringEncoding]);
@@ -213,7 +213,7 @@ TEST_F(TabStripControllerTest, CorrectToolTipText) {
EXPECT_STREQ("Tab1",
[[controller_ view:nil
stringForToolTip:nil
- point:NSMakePoint(0,0)
+ point:NSZeroPoint
userData:nil] cStringUsingEncoding:NSASCIIStringEncoding]);
// Hover over tab 2.
@@ -223,7 +223,7 @@ TEST_F(TabStripControllerTest, CorrectToolTipText) {
EXPECT_STREQ("Tab2",
[[controller_ view:nil
stringForToolTip:nil
- point:NSMakePoint(0,0)
+ point:NSZeroPoint
userData:nil] cStringUsingEncoding:NSASCIIStringEncoding]);
}
@@ -246,7 +246,7 @@ TEST_F(TabStripControllerTest, TabCloseDuringDrag) {
[runner scheduleDelayedRun];
NSEvent* event =
- cocoa_test_event_utils::LeftMouseDownAtPoint(NSMakePoint(0, 0));
+ cocoa_test_event_utils::LeftMouseDownAtPoint(NSZeroPoint);
[[controller_ dragController] maybeStartDrag:event forTab:tab];
}
diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
index 50ae167..45137ec 100644
--- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm
+++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
@@ -111,7 +111,7 @@ TEST_F(BrowserAccessibilityTest, HitTestTest) {
// Test doing a hit test on the edge of a child.
TEST_F(BrowserAccessibilityTest, EdgeHitTest) {
BrowserAccessibilityCocoa* firstChild =
- [accessibility_ accessibilityHitTest:NSMakePoint(0, 0)];
+ [accessibility_ accessibilityHitTest:NSZeroPoint];
EXPECT_NSEQ(@"Child1",
[firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
}
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 2b31b1a..b4afde1 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -3068,7 +3068,7 @@ static const NSTrackingRectTag kTrackingRectTag = 0xBADFACE;
// Nothing matters except window, trackingNumber, and userData.
int windowNumber = [[self window] windowNumber];
NSEvent* fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:0
timestamp:0
windowNumber:windowNumber
@@ -3084,7 +3084,7 @@ static const NSTrackingRectTag kTrackingRectTag = 0xBADFACE;
// Nothing matters except window, trackingNumber, and userData.
int windowNumber = [[self window] windowNumber];
NSEvent* fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:0
timestamp:0
windowNumber:windowNumber
diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
index 0b86cca..f523323 100644
--- a/content/browser/web_contents/web_drag_source_mac.mm
+++ b/content/browser/web_contents/web_drag_source_mac.mm
@@ -311,7 +311,7 @@ NSString* GetDropLocation(NSPasteboard* pboard) {
contents_->GetRenderViewHost());
if (rvh) {
// Convert |screenPoint| to view coordinates and flip it.
- NSPoint localPoint = NSMakePoint(0, 0);
+ NSPoint localPoint = NSZeroPoint;
if ([contentsView_ window])
localPoint = [self convertScreenPoint:screenPoint];
NSRect viewFrame = [contentsView_ frame];
@@ -341,7 +341,7 @@ NSString* GetDropLocation(NSPasteboard* pboard) {
contents_->GetRenderViewHost());
if (rvh) {
// Convert |screenPoint| to view coordinates and flip it.
- NSPoint localPoint = NSMakePoint(0, 0);
+ NSPoint localPoint = NSZeroPoint;
if ([contentsView_ window])
localPoint = [self convertScreenPoint:screenPoint];
NSRect viewFrame = [contentsView_ frame];
diff --git a/content/browser/web_contents/web_drag_source_mac_unittest.mm b/content/browser/web_contents/web_drag_source_mac_unittest.mm
index 1b58319..036c926 100644
--- a/content/browser/web_contents/web_drag_source_mac_unittest.mm
+++ b/content/browser/web_contents/web_drag_source_mac_unittest.mm
@@ -28,7 +28,7 @@ TEST_F(WebDragSourceMacTest, DragInvalidlyEscapedBookmarklet) {
view:view
dropData:dropData.get()
image:nil
- offset:NSMakePoint(0, 0)
+ offset:NSZeroPoint
pasteboard:[NSPasteboard pasteboardWithUniqueName]
dragOperationMask:NSDragOperationCopy]);
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm
index 1117e2e..d025ca8 100644
--- a/content/renderer/render_view_browsertest_mac.mm
+++ b/content/renderer/render_view_browsertest_mac.mm
@@ -30,7 +30,7 @@ NSEvent* CmdDeadKeyEvent(NSEventType type, unsigned short code) {
NSString* s = [NSString stringWithFormat:@"%C", uniChar];
return [NSEvent keyEventWithType:type
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:NSCommandKeyMask
timestamp:0.0
windowNumber:0
diff --git a/ui/base/test/cocoa_test_event_utils.mm b/ui/base/test/cocoa_test_event_utils.mm
index f567494..7d01773 100644
--- a/ui/base/test/cocoa_test_event_utils.mm
+++ b/ui/base/test/cocoa_test_event_utils.mm
@@ -46,7 +46,7 @@ NSEvent* MouseEventAtPoint(NSPoint point, NSEventType type,
}
NSEvent* MouseEventWithType(NSEventType type, NSUInteger modifiers) {
- return MouseEventAtPoint(NSMakePoint(0, 0), type, modifiers);
+ return MouseEventAtPoint(NSZeroPoint, type, modifiers);
}
static NSEvent* MouseEventAtPointInWindow(NSPoint point,
diff --git a/ui/base/test/ui_controls_mac.mm b/ui/base/test/ui_controls_mac.mm
index 23aabe0..5303c6f9 100644
--- a/ui/base/test/ui_controls_mac.mm
+++ b/ui/base/test/ui_controls_mac.mm
@@ -107,7 +107,7 @@ NSEvent* SynthesizeKeyEvent(NSWindow* window,
// location should be fine.
NSEvent* event =
[NSEvent keyEventWithType:type
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:flags
timestamp:TimeIntervalSinceSystemStartup()
windowNumber:[window windowNumber]
diff --git a/webkit/plugins/npapi/plugin_instance_mac.mm b/webkit/plugins/npapi/plugin_instance_mac.mm
index 8c8016f..2a51986 100644
--- a/webkit/plugins/npapi/plugin_instance_mac.mm
+++ b/webkit/plugins/npapi/plugin_instance_mac.mm
@@ -57,7 +57,7 @@ NSEvent* NSEventForNPCocoaEvent(NPCocoaEvent* np_event, NSWindow* window) {
// NPCocoaEvent doesn't have a timestamp, so just use the current time.
NSEvent* event =
[NSEvent mouseEventWithType:event_type
- location:NSMakePoint(0, 0)
+ location:NSZeroPoint
modifierFlags:modifiers
timestamp:[[NSApp currentEvent] timestamp]
windowNumber:[window windowNumber]