chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc - Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset

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: chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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: chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc b/chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc

index aa0cdf2ec8757773dfcb45459b640ee7433f18d1..fd8250b3356c76476558512696d25d1f0a50a80f 100644

--- a/chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc

+++ b/chrome/browser/ui/webui/options/chromeos/wallpaper_source.cc

@@ -133,7 +133,7 @@ void WallpaperImageSource::GetCurrentUserWallpaper(int request_id) {

SkBitmap wallpaper;

gfx::ImageSkia wallpaper_skia = ash::Shell::GetInstance()->

desktop_background_controller()->GetCurrentWallpaperImage();

- if (!wallpaper_skia.empty())

+ if (!wallpaper_skia.isNull())

wallpaper = *wallpaper_skia.bitmap();

SkBitmap copy;

if (wallpaper.deepCopyTo(&copy, wallpaper.config()))