Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: base/gfx/png_decoder.cc

Issue 65012: Move skia to DEPS, and put it in third_party. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/gfx/native_theme.cc ('k') | base/gfx/png_encoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/gfx/png_decoder.h" 5 #include "base/gfx/png_decoder.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "skia/include/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 9
10 extern "C" { 10 extern "C" {
11 #include "third_party/libpng/png.h" 11 #include "third_party/libpng/png.h"
12 } 12 }
13 13
14 namespace { 14 namespace {
15 15
16 // Converts BGRA->RGBA and RGBA->BGRA. 16 // Converts BGRA->RGBA and RGBA->BGRA.
17 void ConvertBetweenBGRAandRGBA(const unsigned char* input, int pixel_width, 17 void ConvertBetweenBGRAandRGBA(const unsigned char* input, int pixel_width,
18 unsigned char* output) { 18 unsigned char* output) {
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 } 345 }
346 bitmap_data[i + 3] = alpha; 346 bitmap_data[i + 3] = alpha;
347 bitmap_data[i] = (bgra[i] * alpha) >> 8; 347 bitmap_data[i] = (bgra[i] * alpha) >> 8;
348 bitmap_data[i + 1] = (bgra[i + 1] * alpha) >> 8; 348 bitmap_data[i + 1] = (bgra[i + 1] * alpha) >> 8;
349 bitmap_data[i + 2] = (bgra[i + 2] * alpha) >> 8; 349 bitmap_data[i + 2] = (bgra[i + 2] * alpha) >> 8;
350 } 350 }
351 351
352 bitmap->setIsOpaque(opaque); 352 bitmap->setIsOpaque(opaque);
353 return bitmap; 353 return bitmap;
354 } 354 }
OLDNEW
« no previous file with comments | « base/gfx/native_theme.cc ('k') | base/gfx/png_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698