content/renderer/media/android/webmediaplayer_android.cc - Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/webmediaplayer_android.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

« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/html_video_element_capturer_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc

index 6ab41032e752503f28c5e2cde2e926182d5d1645..e1b8d1a30f7a13f377e30102e7e070eb124092d4 100644

--- a/content/renderer/media/android/webmediaplayer_android.cc

+++ b/content/renderer/media/android/webmediaplayer_android.cc

@@ -47,6 +47,7 @@

#include "media/blink/webmediaplayer_delegate.h"

#include "media/blink/webmediaplayer_util.h"

#include "net/base/mime_util.h"

+#include "skia/ext/cdl_paint.h"

#include "skia/ext/texture_handle.h"

#include "third_party/WebKit/public/platform/Platform.h"

#include "third_party/WebKit/public/platform/URLConversion.h"

@@ -64,7 +65,6 @@

#include "third_party/WebKit/public/web/WebView.h"

#include "third_party/skia/include/core/SkCanvas.h"

#include "third_party/skia/include/core/SkImage.h"

-#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/core/SkTypeface.h"

#include "ui/gfx/image/image.h"

#include "url/gurl.h"

@@ -508,7 +508,7 @@ bool WebMediaPlayerAndroid::didLoadingProgress() {

void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas,

const blink::WebRect& rect,

- SkPaint& paint) {

+ CdlPaint& paint) {

DCHECK(main_thread_checker_.CalledOnValidThread());

std::unique_ptr<blink::WebGraphicsContext3DProvider> provider(

blink::Platform::current()

@@ -556,7 +556,7 @@ void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas,

// readbacked to system memory then draw onto the canvas.

SkRect dest;

dest.set(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);

- SkPaint video_paint;

+ CdlPaint video_paint;

video_paint.setAlpha(paint.getAlpha());

video_paint.setBlendMode(paint.getBlendMode());

// It is not necessary to pass the dest into the drawBitmap call since all