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

Side by Side Diff: skia/ext/image_operations.h

Issue 13080: Move convolver and image_operations from base/gfx to skia/ext. This is just... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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 | « skia/ext/convolver_unittest.cc ('k') | skia/ext/image_operations.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.h:r69-2775
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 #ifndef BASE_GFX_IMAGE_OPERATIONS_H__ 5 #ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
6 #define BASE_GFX_IMAGE_OPERATIONS_H__ 6 #define SKIA_EXT_IMAGE_OPERATIONS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/gfx/rect.h" 9 #include "base/gfx/rect.h"
10 10
11 class SkBitmap; 11 class SkBitmap;
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 class ImageOperations { 15 class ImageOperations {
16 public: 16 public:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // use have the kARGB_8888_Config config and be of equal dimensions. 52 // use have the kARGB_8888_Config config and be of equal dimensions.
53 static SkBitmap CreateBlendedBitmap(const SkBitmap& first, 53 static SkBitmap CreateBlendedBitmap(const SkBitmap& first,
54 const SkBitmap& second, 54 const SkBitmap& second,
55 double alpha); 55 double alpha);
56 private: 56 private:
57 ImageOperations(); // Class for scoping only. 57 ImageOperations(); // Class for scoping only.
58 }; 58 };
59 59
60 } // namespace gfx 60 } // namespace gfx
61 61
62 #endif // BASE_GFX_IMAGE_OPERATIONS_H__ 62 #endif // SKIA_EXT_IMAGE_OPERATIONS_H__
63 63
OLDNEW
« no previous file with comments | « skia/ext/convolver_unittest.cc ('k') | skia/ext/image_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698