summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/tab_strip_controller.mm
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:11:59 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 21:11:59 +0000
commitdf237c2aa738e7af8157cfc861f7f2108d529963 (patch)
treeeb049b63d9b2447c033f5b85946a9a72157bfa72 /chrome/browser/cocoa/tab_strip_controller.mm
parentbceb3812b506b604d469504b5ef3e3e9d61b939e (diff)
downloadchromium_src-df237c2aa738e7af8157cfc861f7f2108d529963.zip
chromium_src-df237c2aa738e7af8157cfc861f7f2108d529963.tar.gz
chromium_src-df237c2aa738e7af8157cfc861f7f2108d529963.tar.bz2
Fix an uninitialized variable that valgrind complains about.
BUG=none TEST=Tab dragging on the Mac should still work. Review URL: http://codereview.chromium.org/131055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_strip_controller.mm')
-rw-r--r--chrome/browser/cocoa/tab_strip_controller.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 6af86bf..67532c8 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -64,6 +64,7 @@ NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
dragBlockingView_.reset([[TabStripControllerDragBlockingView alloc]
initWithFrame:NSZeroRect]);
[view addSubview:dragBlockingView_];
+ newTabTargetFrame_ = NSMakeRect(0, 0, 0, 0);
}
return self;
}
@@ -252,8 +253,9 @@ NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";
// Check the frame by identifier to avoid redundant calls to animator.
NSValue *identifier = [NSValue valueWithPointer:[tab view]];
- NSRect oldTarget = [[targetFrames_ objectForKey:identifier] rectValue];
- if (!NSEqualRects(oldTarget, tabFrame)) {
+ NSValue *oldTargetValue = [targetFrames_ objectForKey:identifier];
+ if (!oldTargetValue ||
+ !NSEqualRects([oldTargetValue rectValue], tabFrame)) {
[frameTarget setFrame:tabFrame];
[targetFrames_ setObject:[NSValue valueWithRect:tabFrame]
forKey:identifier];