ash/desktop_background/desktop_background_view.cc - Issue 10854153: Fix memory leak on Chromium OS Heapcheck and Chromium OS (valgrind)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 10854153: Fix memory leak on Chromium OS Heapcheck and Chromium OS (valgrind) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use scoped ptr to manage ownership Created 8 years, 4 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:

Index: ash/desktop_background/desktop_background_view.cc

diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc

index fcbd935639c5114f0ca42976826fc600b914106d..a06b55e124ad615de7aa5cdce827275d1034066d 100644

--- a/ash/desktop_background/desktop_background_view.cc

+++ b/ash/desktop_background/desktop_background_view.cc

@@ -51,7 +51,8 @@ class ShowWallpaperAnimationObserver : public ui::ImplicitAnimationObserver {

// animation.

if (root_window_->GetProperty(kComponentWrapper)) {

internal::DesktopBackgroundWidgetController* component =

- root_window_->GetProperty(kComponentWrapper)->component();

+ root_window_->GetProperty(kComponentWrapper)->GetComponent(true);

+ LOG(ERROR) << "===taken ownership===";

sky 2012/08/15 20:45:42 remove this.

bshe 2012/08/15 20:49:39 Aha. Sorry, I missed it.

root_window_->SetProperty(kWindowDesktopComponent, component);

}