Index: media/filters/skcanvas_video_renderer.cc |
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc |
index 0658762b3f407f7a01abf79af79646ab75d254e0..31e4fafd9358167e5cd2886788a9566db5f30243 100644 |
--- a/media/filters/skcanvas_video_renderer.cc |
+++ b/media/filters/skcanvas_video_renderer.cc |
@@ -70,10 +70,9 @@ static bool CanFastPaint(SkCanvas* canvas, uint8 alpha, |
SkScalarNearlyZero(total_matrix.getSkewY()) && |
total_matrix.getScaleX() > 0 && |
total_matrix.getScaleY() > 0) { |
- SkBaseDevice* device = canvas->getDevice(); |
- const SkBitmap::Config config = device->config(); |
+ const SkImageInfo info = canvas->imageInfo(); |
Ami GONE FROM CHROMIUM
2014/06/03 17:01:07
const& instead of const ?
reed1
2014/06/03 17:26:08
The canvas is returning by value, not by ref. Shou
Ami GONE FROM CHROMIUM
2014/06/03 21:24:47
Probably not.
|
- if (config == SkBitmap::kARGB_8888_Config && device->isOpaque()) { |
+ if (info.colorType() == kN32_SkColorType && info.isOpaque()) { |
Ami GONE FROM CHROMIUM
2014/06/03 17:01:07
Isn't this a behavior change on Android per l.14?
reed1
2014/06/03 17:26:08
Not sure the android reference. My change is funct
Ami GONE FROM CHROMIUM
2014/06/03 21:24:47
Huh; I was confused by
https://code.google.com/p/
|
return true; |
} |
} |