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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 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/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index a8a4378ddfe96f15e9e8352e703c25c32b097076..683e5b8c216bea9b11c6bbd54219c30dd627ea04 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -21,6 +21,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/layers/video_layer.h"
+#include "cc/paint/paint_flags.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/renderer_preferences.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"
@@ -507,7 +507,7 @@ bool WebMediaPlayerAndroid::didLoadingProgress() {
void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas,
const blink::WebRect& rect,
- SkPaint& paint) {
+ cc::PaintFlags& paint) {
DCHECK(main_thread_checker_.CalledOnValidThread());
std::unique_ptr<blink::WebGraphicsContext3DProvider> provider(
blink::Platform::current()
@@ -555,7 +555,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;
+ cc::PaintFlags 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
« 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 »

Powered by Google App Engine
This is Rietveld 408576698