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

Unified Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years 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/webrtc/webrtc_video_capturer_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 65d3d4ccede8d6d72ffc859396dab6b87777dc12..5339a5421de1dba16f4d5ccc12d466146ccc898a 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -15,6 +15,7 @@
#include "media/base/timestamp_constants.h"
#include "media/base/video_util.h"
#include "media/renderers/skcanvas_video_renderer.h"
+#include "skia/ext/cdl_surface.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
@@ -100,7 +101,7 @@ class WebRtcVideoCapturerAdapter::TextureFrameCopier
frame->format() == media::PIXEL_FORMAT_UYVY ||
frame->format() == media::PIXEL_FORMAT_NV12);
ScopedWaitableEvent event(waiter);
- sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
+ sk_sp<CdlSurface> surface = CdlSurface::MakeRasterN32Premul(
frame->visible_rect().width(), frame->visible_rect().height());
if (!surface || !provider_) {
@@ -119,7 +120,7 @@ class WebRtcVideoCapturerAdapter::TextureFrameCopier
media::Context3D(provider_->ContextGL(), provider_->GrContext()));
SkPixmap pixmap;
- const bool result = surface->getCanvas()->peekPixels(&pixmap);
+ const bool result = GetSkCanvas(surface->getCanvas())->peekPixels(&pixmap);
DCHECK(result) << "Error trying to access SkSurface's pixels";
const uint32 source_pixel_format =
(kN32_SkColorType == kRGBA_8888_SkColorType) ? cricket::FOURCC_ABGR
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_compositor.cc ('k') | content/renderer/pepper/pepper_graphics_2d_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698