Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2709)

Unified Diff: content/renderer/media_capture_from_element/html_video_element_capturer_source.h

Issue 2764633002: cc/paint: Remove cc::PaintSurface. (Closed)
Patch Set: fix for relanding Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4621b2fa03672845986fd9fc4a84bd7a3a6bb32d..bc6f192421a42d3d8abf2deb8291c19a17e119f4 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{
@@ -25,6 +25,10 @@ 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
@@ -60,7 +64,8 @@ class CONTENT_EXPORT HtmlVideoElementCapturerSource final
void sendNewFrame();
media::VideoFramePool frame_pool_;
- sk_sp<cc::PaintSurface> surface_;
+ SkBitmap bitmap_;
+ std::unique_ptr<cc::PaintCanvas> canvas_;
const base::WeakPtr<blink::WebMediaPlayer> web_media_player_;
const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698