diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 14:44:31 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 14:44:31 +0000 |
| commit | 2a4f026f209e6e6509a982796621a9d1f713907e (patch) | |
| tree | 32c2f5cdd6c84e5ba61b5b469c62ffd52d9e18d7 /ui/gfx/image.cc | |
| parent | 3bb0702483dc98b3324f7645777b986911e8289b (diff) | |
| download | chromium_src-2a4f026f209e6e6509a982796621a9d1f713907e.zip chromium_src-2a4f026f209e6e6509a982796621a9d1f713907e.tar.gz chromium_src-2a4f026f209e6e6509a982796621a9d1f713907e.tar.bz2 | |
C++ readability review for Robert Sesek <rsesek@google.com>.
R=smo
OCL=http://codereview.chromium.org/6312159/
BUG=http://b/3477621
TEST=none
Review URL: http://codereview.chromium.org/6538096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image.cc')
| -rw-r--r-- | ui/gfx/image.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ui/gfx/image.cc b/ui/gfx/image.cc index 41c1594..b42e215 100644 --- a/ui/gfx/image.cc +++ b/ui/gfx/image.cc @@ -33,7 +33,7 @@ const SkBitmap* NSImageToSkBitmap(NSImage* image); const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) { gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), - false); + /*is_opaque=*/false); canvas.DrawGdkPixbuf(pixbuf, 0, 0); return new SkBitmap(canvas.ExtractBitmap()); } @@ -250,11 +250,9 @@ internal::ImageRep* Image::GetRepresentation(RepresentationType rep_type) { internal::NSImageToSkBitmap(nsimage_rep->image())); } #endif - if (rep) { - AddRepresentation(rep); - return rep; - } - NOTREACHED(); + CHECK(rep); + AddRepresentation(rep); + return rep; } // Handle Skia-to-native conversions. @@ -273,11 +271,9 @@ internal::ImageRep* Image::GetRepresentation(RepresentationType rep_type) { native_rep = new internal::NSImageRep(image); } #endif - if (native_rep) { - AddRepresentation(native_rep); - return native_rep; - } - NOTREACHED(); + CHECK(native_rep); + AddRepresentation(native_rep); + return native_rep; } // Something went seriously wrong... |