| Index: content/common/gpu/client/gl_helper.h
|
| diff --git a/content/common/gpu/client/gl_helper.h b/content/common/gpu/client/gl_helper.h
|
| index 6c50ad12ca1251ba4c66b438e43ed823b8c6e7aa..dc90ddeb1c4639c4474817bdc5e2c245539c6c7e 100644
|
| --- a/content/common/gpu/client/gl_helper.h
|
| +++ b/content/common/gpu/client/gl_helper.h
|
| @@ -160,8 +160,8 @@ class CONTENT_EXPORT GLHelper {
|
|
|
| // Copies the block of pixels specified with |src_subrect| from |src_texture|,
|
| // scales it to |dst_size|, and writes it into |out|.
|
| - // |src_size| is the size of |src_texture|. The result is of format GL_BGRA
|
| - // and is potentially flipped vertically to make it a correct image
|
| + // |src_size| is the size of |src_texture|. The result is in |out_color_type|
|
| + // format and is potentially flipped vertically to make it a correct image
|
| // representation. |callback| is invoked with the copy result when the copy
|
| // operation has completed.
|
| // Note that the src_texture will have the min/mag filter set to GL_LINEAR
|
| @@ -172,14 +172,14 @@ class CONTENT_EXPORT GLHelper {
|
| const gfx::Rect& src_subrect,
|
| const gfx::Size& dst_size,
|
| unsigned char* out,
|
| - const SkColorType color_type,
|
| + const SkColorType out_color_type,
|
| const base::Callback<void(bool)>& callback,
|
| GLHelper::ScalerQuality quality);
|
|
|
| // Copies the block of pixels specified with |src_subrect| from |src_mailbox|,
|
| // scales it to |dst_size|, and writes it into |out|.
|
| - // |src_size| is the size of |src_mailbox|. The result is of format GL_BGRA
|
| - // and is potentially flipped vertically to make it a correct image
|
| + // |src_size| is the size of |src_mailbox|. The result is in |out_color_type|
|
| + // format and is potentially flipped vertically to make it a correct image
|
| // representation. |callback| is invoked with the copy result when the copy
|
| // operation has completed.
|
| // Note that the texture bound to src_mailbox will have the min/mag filter set
|
| @@ -192,7 +192,7 @@ class CONTENT_EXPORT GLHelper {
|
| const gfx::Rect& src_subrect,
|
| const gfx::Size& dst_size,
|
| unsigned char* out,
|
| - const SkColorType color_type,
|
| + const SkColorType out_color_type,
|
| const base::Callback<void(bool)>& callback,
|
| GLHelper::ScalerQuality quality);
|
|
|
|
|