diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 13:58:57 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 13:58:57 +0000 |
| commit | 982735c278476e99b504feaa775fa7b3c0fd8fa8 (patch) | |
| tree | b6949930607de82a62e3eb7f20a0748f3794b4c4 /chrome/browser/icon_loader_linux.cc | |
| parent | 2722dd04f58683556bfcaf1db6b79b1b95b9b93f (diff) | |
| download | chromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.zip chromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.tar.gz chromium_src-982735c278476e99b504feaa775fa7b3c0fd8fa8.tar.bz2 | |
Convert IconLoader to use gfx::ScopedImage<> and other hygiene fixes.
BUG=none
TEST=compile/automated tests
Review URL: http://codereview.chromium.org/4121008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader_linux.cc')
| -rw-r--r-- | chrome/browser/icon_loader_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc index a4cf378..2452b4a 100644 --- a/chrome/browser/icon_loader_linux.cc +++ b/chrome/browser/icon_loader_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -66,8 +66,8 @@ void IconLoader::ParseIcon() { pixel_vector.resize(height * stride); memcpy(const_cast<unsigned char*>(pixel_vector.data()), BGRA_pixels, height * stride); - bitmap_ = gfx::PNGCodec::CreateSkBitmapFromBGRAFormat(pixel_vector, - width, height); + bitmap_.Set(gfx::PNGCodec::CreateSkBitmapFromBGRAFormat(pixel_vector, + width, height)); free(BGRA_pixels); } } else { |