Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / client / gl_helper.h

diff --git a/src/content/common/gpu/client/gl_helper.h b/src/content/common/gpu/client/gl_helper.h
index 6c50ad1..dc90dde 100644 (file)
--- a/src/content/common/gpu/client/gl_helper.h
+++ b/src/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);