diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 19:57:10 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 19:57:10 +0000 |
| commit | e04b051f8bb42b39b449825fca2fd0f6d0677620 (patch) | |
| tree | 94cf7235d530ec9693c9c210bd7790426f9e51c7 | |
| parent | 0e51b4fe20105bec9d30845406ce33707794629f (diff) | |
| download | chromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.zip chromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.tar.gz chromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.tar.bz2 | |
Fix uninitialized memory error caused by r50606.
BUG=48269
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52514 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/tab_window_controller.mm | 5 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm index 00d9d0e..c1701f1 100644 --- a/chrome/browser/cocoa/tab_window_controller.mm +++ b/chrome/browser/cocoa/tab_window_controller.mm @@ -65,9 +65,10 @@ // view hierarchy as a sibling of the content view so it can overlap with the // window frame. - (void)addTopTabStripToWindow { + NSRect contentFrame = [tabContentArea_ frame]; NSRect tabFrame = - NSMakeRect(0, NSMaxY(tabFrame), - NSWidth([tabContentArea_ frame]), + NSMakeRect(0, NSMaxY(contentFrame), + NSWidth(contentFrame), NSHeight([topTabStripView_ frame])); [topTabStripView_ setFrame:tabFrame]; NSView* contentParent = [[[self window] contentView] superview]; diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index 5c2f8f3..f9a12a3 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1279,16 +1279,6 @@ fun:_ZN18FocusIndicationFix40currentOSHasSetFocusRingStyleInBitmapBugEv } { - bug_48269 - Memcheck:Cond - ... - fun:-[BrowserWindowController initWithBrowser:takeOwnership:] - fun:-[BrowserWindowController initWithBrowser:] - fun:_ZN13BrowserWindow19CreateBrowserWindowEP7Browser - fun:_ZN7Browser19CreateBrowserWindowEv - fun:_ZN7Browser6CreateEP7Profile -} -{ bug_49086 Memcheck:Leak fun:_Znw* |