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

content/renderer/media_capture_from_element/html_video_element_capturer_source.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CAPTURE_FROM_ELEMENT_HTML_VIDEO_ELEMENT_CAPTURER_SOURCE_H_
 #define CONTENT_RENDERER_MEDIA_CAPTURE_FROM_ELEMENT_HTML_VIDEO_ELEMENT_CAPTURER_SOURCE_H_
 
 #include "base/callback.h"
 #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{
 class SingleThreadTaskRunner;
 }
 
 namespace blink {
 class WebMediaPlayer;
 }  // namespace blink
 
-namespace cc {
-class PaintCanvas;
-}  // namespace cc
-
 namespace content {
 
 // This class is a VideoCapturerSource taking video snapshots of the ctor-passed
 // blink::WebMediaPlayer on Render Main thread. The captured data is converted
 // and sent back to |io_task_runner_| via the registered |new_frame_callback_|.
 class CONTENT_EXPORT HtmlVideoElementCapturerSource final
     : public media::VideoCapturerSource {
  public:
   static std::unique_ptr<HtmlVideoElementCapturerSource>
   CreateFromWebMediaPlayerImpl(
@@ skipping 15 matching lines @@
                     const VideoCaptureDeliverFrameCB& new_frame_callback,
                     const RunningCallback& running_callback) override;
   void StopCapture() override;
 
  private:
   // This method includes collecting data from the WebMediaPlayer and converting
   // it into a format suitable for MediaStreams.
   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_;
 
   // These three configuration items are passed on StartCapture();
   RunningCallback running_callback_;
   VideoCaptureDeliverFrameCB new_frame_callback_;
   double capture_frame_rate_;
 
   // Target time for the next frame.
   base::TimeTicks next_capture_time_;
 
   // Bound to the main render thread.
   base::ThreadChecker thread_checker_;
 
   // Used on main render thread to schedule future capture events.
   base::WeakPtrFactory<HtmlVideoElementCapturerSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HtmlVideoElementCapturerSource);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CAPTURE_FROM_ELEMENT_HTML_VIDEO_ELEMENT_CAPTURER_SOURCE_H_