| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/gfx/ipc/gfx_param_traits.h" | 5 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/geometry/rect.h" |
| 11 #include "ui/gfx/rect_f.h" | 11 #include "ui/gfx/geometry/rect_f.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 struct SkBitmap_Data { | 15 struct SkBitmap_Data { |
| 16 // The color type for the bitmap (bits per pixel, etc). | 16 // The color type for the bitmap (bits per pixel, etc). |
| 17 SkColorType fColorType; | 17 SkColorType fColorType; |
| 18 | 18 |
| 19 // The alpha type for the bitmap (opaque, premul, unpremul). | 19 // The alpha type for the bitmap (opaque, premul, unpremul). |
| 20 SkAlphaType fAlphaType; | 20 SkAlphaType fAlphaType; |
| 21 | 21 |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 const SkBitmap_Data* bmp_data = | 259 const SkBitmap_Data* bmp_data = |
| 260 reinterpret_cast<const SkBitmap_Data*>(fixed_data); | 260 reinterpret_cast<const SkBitmap_Data*>(fixed_data); |
| 261 return bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size); | 261 return bmp_data->InitSkBitmapFromData(r, variable_data, variable_data_size); |
| 262 } | 262 } |
| 263 | 263 |
| 264 void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::string* l) { | 264 void ParamTraits<SkBitmap>::Log(const SkBitmap& p, std::string* l) { |
| 265 l->append("<SkBitmap>"); | 265 l->append("<SkBitmap>"); |
| 266 } | 266 } |
| 267 | 267 |
| 268 } // namespace IPC | 268 } // namespace IPC |
| OLD | NEW |