Remove Uint8ClampedArray use from ImageBuffer.h ImageDataBuffer

Source/platform/image-encoders/skia/JPEGImageEncoder.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 99 matching lines @@
 {
     if (quality < 100)
         return;
 
     for (int i = 0; i < MAX_COMPONENTS; ++i) {
         cinfo->comp_info[i].h_samp_factor = 1;
         cinfo->comp_info[i].v_samp_factor = 1;
     }
 }
 
-static bool encodePixels(IntSize imageSize, unsigned char* inputPixels, bool premultiplied, int quality, Vector<unsigned char>* output)
+static bool encodePixels(IntSize imageSize, const unsigned char* inputPixels, bool premultiplied, int quality, Vector<unsigned char>* output)
 {
     JPEGOutputBuffer destination;
     destination.output = output;
     Vector<JSAMPLE> row;
 
     jpeg_compress_struct cinfo;
     jpeg_error_mgr error;
     cinfo.err = jpeg_std_error(&error);
     error.error_exit = handleError;
     jmp_buf jumpBuffer;
@@ skipping 18 matching lines @@
     if (premultiplied) {
         cinfo.in_color_space = SK_B32_SHIFT ? JCS_EXT_RGBX : JCS_EXT_BGRX;
 
         cinfo.input_components = 4;
 
         jpeg_set_defaults(&cinfo);
         jpeg_set_quality(&cinfo, quality, TRUE);
         disableSubsamplingForHighQuality(&cinfo, quality);
         jpeg_start_compress(&cinfo, TRUE);
 
-        unsigned char* pixels = inputPixels;
+        unsigned char* pixels = const_cast<unsigned char*>(inputPixels);
         const size_t pixelRowStride = cinfo.image_width * 4;
         while (cinfo.next_scanline < cinfo.image_height) {
             jpeg_write_scanlines(&cinfo, &pixels, 1);
             pixels += pixelRowStride;
         }
 
         jpeg_finish_compress(&cinfo);
         jpeg_destroy_compress(&cinfo);
         return true;
     }
 #endif
 
     cinfo.in_color_space = JCS_RGB;
     cinfo.input_components = 3;
 
     void (*extractRowRGB)(const unsigned char*, unsigned, unsigned char* output);
     extractRowRGB = &RGBAtoRGB;
     if (premultiplied)
         extractRowRGB = &preMultipliedBGRAtoRGB;
 
     jpeg_set_defaults(&cinfo);
     jpeg_set_quality(&cinfo, quality, TRUE);
     disableSubsamplingForHighQuality(&cinfo, quality);
     jpeg_start_compress(&cinfo, TRUE);
 
-    unsigned char* pixels = inputPixels;
+    unsigned char* pixels = const_cast<unsigned char*>(inputPixels);
     row.resize(cinfo.image_width * cinfo.input_components);
     const size_t pixelRowStride = cinfo.image_width * 4;
     while (cinfo.next_scanline < cinfo.image_height) {
         JSAMPLE* rowData = row.data();
         extractRowRGB(pixels, cinfo.image_width, rowData);
         jpeg_write_scanlines(&cinfo, &rowData, 1);
         pixels += pixelRowStride;
     }
 
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);
     return true;
 }
 
 bool JPEGImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsigned char>* output)
 {
     SkAutoLockPixels bitmapLock(bitmap);
 
     if (bitmap.colorType() != kN32_SkColorType || !bitmap.getPixels())
         return false; // Only support 32 bit/pixel skia bitmaps.
 
     return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<unsigned char *>(bitmap.getPixels()), true, quality, output);
 }
 
 bool JPEGImageEncoder::encode(const ImageDataBuffer& imageData, int quality, Vector<unsigned char>* output)
 {
-    return encodePixels(imageData.size(), imageData.data(), false, quality, output);
+    return encodePixels(IntSize(imageData.width(), imageData.height()), imageData.pixels(), false, quality, output);

[Yuki, 2015/01/07 13:00:57]

Why don't you use imageData.size()?

 }
 
 } // namespace blink