Use SkJpegEncoder in gfx jpeg_codec

chrome/renderer/chrome_render_frame_observer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_render_frame_observer.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <limits>
@@ skipping 195 matching lines @@
   if (thumbnail.colorType() == kN32_SkColorType) {
     bitmap = thumbnail;
   } else {
     SkImageInfo info = thumbnail.info().makeColorType(kN32_SkColorType);
     if (bitmap.tryAllocPixels(info)) {
       thumbnail.readPixels(info, bitmap.getPixels(), bitmap.rowBytes(), 0, 0);
     }
   }
 
   std::vector<uint8_t> thumbnail_data;
-  if (bitmap.getPixels()) {
+  SkPixmap pixmap;
+  if (!bitmap.peekPixels(&pixmap)) {

[scroggo_chromium, 2017/06/07 18:15:13]

I think you don't want the "!" here?

[msarett1, 2017/06/07 18:20:11]

Oops, good catch.

     const int kDefaultQuality = 90;
     std::vector<unsigned char> data;
-    if (gfx::JPEGCodec::Encode(
-            reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
-            gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(),
-            static_cast<int>(bitmap.rowBytes()), kDefaultQuality, &data)) {
+    if (gfx::JPEGCodec::Encode(pixmap, kDefaultQuality, &data)) {
       thumbnail_data.swap(data);
     }
   }
 
   callback.Run(thumbnail_data, original_size);
 }
 
 void ChromeRenderFrameObserver::OnPrintNodeUnderContextMenu() {
 #if BUILDFLAG(ENABLE_PRINTING)
   printing::PrintWebViewHelper* helper =
@@ skipping 132 matching lines @@
     const service_manager::BindSourceInfo& source_info,
     chrome::mojom::ImageContextMenuRendererRequest request) {
   image_context_menu_renderer_bindings_.AddBinding(this, std::move(request));
 }
 
 void ChromeRenderFrameObserver::OnThumbnailCapturerRequest(
     const service_manager::BindSourceInfo& source_info,
     chrome::mojom::ThumbnailCapturerRequest request) {
   thumbnail_capturer_bindings_.AddBinding(this, std::move(request));
 }