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

Unified Diff: third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp

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: third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
index 453ce6a4c6a1b1c64ccb5e3b011e6e69949bce74..f0fb3d2128de72c9918ddee2736c5c30266b8967 100644
--- a/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp
@@ -41,8 +41,8 @@ CrossfadeGeneratedImage::CrossfadeGeneratedImage(PassRefPtr<Image> fromImage,
m_percentage(percentage),
m_crossfadeSize(crossfadeSize) {}
-void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas,
- const SkPaint& paint,
+void CrossfadeGeneratedImage::drawCrossfade(CdlCanvas* canvas,
+ const CdlPaint& paint,
ImageClampingMode clampMode) {
FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size()));
FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size()));
@@ -52,12 +52,12 @@ void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas,
// applied here instead of inside the layer. This probably faulty behavior
// was maintained in order to preserve pre-existing behavior while refactoring
// this code. This should be investigated further. crbug.com/472634
- SkPaint layerPaint;
+ CdlPaint layerPaint;
layerPaint.setBlendMode(paint.getBlendMode());
- SkAutoCanvasRestore ar(canvas, false);
+ CdlAutoCanvasRestore ar(canvas, false);
canvas->saveLayer(nullptr, &layerPaint);
- SkPaint imagePaint(paint);
+ CdlPaint imagePaint(paint);
imagePaint.setBlendMode(SkBlendMode::kSrcOver);
int imageAlpha = clampedAlphaForBlending(1 - m_percentage);
imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha);
@@ -75,8 +75,8 @@ void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas,
DoNotRespectImageOrientation, clampMode);
}
-void CrossfadeGeneratedImage::draw(SkCanvas* canvas,
- const SkPaint& paint,
+void CrossfadeGeneratedImage::draw(CdlCanvas* canvas,
+ const CdlPaint& paint,
const FloatRect& dstRect,
const FloatRect& srcRect,
RespectImageOrientationEnum,
@@ -85,7 +85,7 @@ void CrossfadeGeneratedImage::draw(SkCanvas* canvas,
if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
return;
- SkAutoCanvasRestore ar(canvas, true);
+ CdlAutoCanvasRestore ar(canvas, true);
canvas->clipRect(dstRect);
canvas->translate(dstRect.x(), dstRect.y());
if (dstRect.size() != srcRect.size())
@@ -102,7 +102,7 @@ void CrossfadeGeneratedImage::drawTile(GraphicsContext& context,
if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage())
return;
- SkPaint paint = context.fillPaint();
+ CdlPaint paint = context.fillPaint();
paint.setBlendMode(SkBlendMode::kSrcOver);
paint.setAntiAlias(context.shouldAntialias());
FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize));

Powered by Google App Engine
This is Rietveld 408576698