Revert of cc/paint: Remove cc::PaintSurface.

content/renderer/media_capture_from_element/html_video_element_capturer_source.h

Index: content/renderer/media_capture_from_element/html_video_element_capturer_source.h
diff --git a/content/renderer/media_capture_from_element/html_video_element_capturer_source.h b/content/renderer/media_capture_from_element/html_video_element_capturer_source.h
index bc6f192421a42d3d8abf2deb8291c19a17e119f4..4621b2fa03672845986fd9fc4a84bd7a3a6bb32d 100644
--- a/content/renderer/media_capture_from_element/html_video_element_capturer_source.h
+++ b/content/renderer/media_capture_from_element/html_video_element_capturer_source.h
@@ -9,12 +9,12 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
+#include "cc/paint/paint_surface.h"
 #include "content/common/content_export.h"
 #include "media/base/video_frame_pool.h"
 #include "media/base/video_types.h"
 #include "media/capture/video_capturer_source.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace base{
@@ -24,10 +24,6 @@
 namespace blink {
 class WebMediaPlayer;
 }  // namespace blink
-
-namespace cc {
-class PaintCanvas;
-}  // namespace cc
 
 namespace content {
 
@@ -64,8 +60,7 @@
   void sendNewFrame();
 
   media::VideoFramePool frame_pool_;
-  SkBitmap bitmap_;
-  std::unique_ptr<cc::PaintCanvas> canvas_;
+  sk_sp<cc::PaintSurface> surface_;
 
   const base::WeakPtr<blink::WebMediaPlayer> web_media_player_;
   const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;