| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 UI_GFX_SKIA_UTIL_H_ | 5 #ifndef UI_GFX_SKIA_UTIL_H_ |
| 6 #define UI_GFX_SKIA_UTIL_H_ | 6 #define UI_GFX_SKIA_UTIL_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/string16.h" | 11 #include "base/string16.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 // Strip the accelerator char (typically '&') from a menu string. A double | 43 // Strip the accelerator char (typically '&') from a menu string. A double |
| 44 // accelerator char ('&&') will be converted to a single char. The out params | 44 // accelerator char ('&&') will be converted to a single char. The out params |
| 45 // |accelerated_char_pos| and |accelerated_char_span| will be set to the index | 45 // |accelerated_char_pos| and |accelerated_char_span| will be set to the index |
| 46 // and span of the last accelerated character, respectively, or -1 and 0 if | 46 // and span of the last accelerated character, respectively, or -1 and 0 if |
| 47 // there was none. | 47 // there was none. |
| 48 UI_EXPORT string16 RemoveAcceleratorChar(const string16& s, | 48 UI_EXPORT string16 RemoveAcceleratorChar(const string16& s, |
| 49 char16 accelerator_char, | 49 char16 accelerator_char, |
| 50 int* accelerated_char_pos, | 50 int* accelerated_char_pos, |
| 51 int* accelerated_char_span); | 51 int* accelerated_char_span); |
| 52 | 52 |
| 53 // Converts Skia ARGB format pixels in |skia| to RGBA. | |
| 54 UI_EXPORT void ConvertSkiaToRGBA(const unsigned char* skia, | |
| 55 int pixel_width, | |
| 56 unsigned char* rgba); | |
| 57 | |
| 58 } // namespace gfx | 53 } // namespace gfx |
| 59 | 54 |
| 60 #endif // UI_GFX_SKIA_UTIL_H_ | 55 #endif // UI_GFX_SKIA_UTIL_H_ |
| OLD | NEW |