Index: chrome/renderer/chrome_render_frame_observer.cc |
diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc |
index a49d2e2f8da0a217b5cd9506a3dc3c8bc1d47275..eab661f50ce768704d552ce620c1c648a3c22cac 100644 |
--- a/chrome/renderer/chrome_render_frame_observer.cc |
+++ b/chrome/renderer/chrome_render_frame_observer.cc |
@@ -213,13 +213,11 @@ void ChromeRenderFrameObserver::RequestThumbnailForContextNode( |
} |
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); |
} |
} |