Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc |
index 8383396b5dc428eab6414a6b6de5cafe14f40cd5..9db52c78420354a72b10da4eca6a6238418db967 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc |
@@ -26,7 +26,6 @@ |
#include "media/filters/skcanvas_video_renderer.h" |
#include "net/base/net_util.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
-#include "third_party/skia/include/core/SkBitmapDevice.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "ui/base/ui_base_switches.h" |
#include "ui/gfx/size_conversions.h" |
@@ -582,14 +581,12 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture |
media::SkCanvasVideoRenderer video_renderer; |
SkBitmap bitmap; |
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, |
- video_frame->visible_rect().width(), |
- video_frame->visible_rect().height(), |
- 0, kOpaque_SkAlphaType); |
+ bitmap.allocPixels(SkImageInfo::Make(video_frame->visible_rect().width(), |
+ video_frame->visible_rect().height(), |
+ kPMColor_SkColorType, |
+ kOpaque_SkAlphaType)); |
bitmap.allocPixels(); |
- |
- SkBitmapDevice device(bitmap); |
- SkCanvas canvas(&device); |
+ SkCanvas canvas(bitmap); |
video_renderer.Paint(video_frame.get(), |
&canvas, |