| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 : GeneratedImage(size) | 35 : GeneratedImage(size) |
| 36 , m_fromImage(fromImage) | 36 , m_fromImage(fromImage) |
| 37 , m_toImage(toImage) | 37 , m_toImage(toImage) |
| 38 , m_percentage(percentage) | 38 , m_percentage(percentage) |
| 39 , m_crossfadeSize(crossfadeSize) | 39 , m_crossfadeSize(crossfadeSize) |
| 40 { | 40 { |
| 41 } | 41 } |
| 42 | 42 |
| 43 void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& pai
nt, ImageClampingMode clampMode) | 43 void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& pai
nt, ImageClampingMode clampMode) |
| 44 { | 44 { |
| 45 FloatRect fromImageRect(FloatPoint(), m_fromImage->size()); | 45 FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size())); |
| 46 FloatRect toImageRect(FloatPoint(), m_toImage->size()); | 46 FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size())); |
| 47 FloatRect destRect(FloatPoint(), m_crossfadeSize); | 47 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); |
| 48 | 48 |
| 49 // TODO(junov): The various effects encoded into paint should probably be ap
plied here | 49 // TODO(junov): The various effects encoded into paint should probably be ap
plied here |
| 50 // instead of inside the layer. This probably faulty behavior was maintaine
d in order | 50 // instead of inside the layer. This probably faulty behavior was maintaine
d in order |
| 51 // to preserve pre-existing behavior while refactoring this code. This shou
ld be | 51 // to preserve pre-existing behavior while refactoring this code. This shou
ld be |
| 52 // investigated further. crbug.com/472634 | 52 // investigated further. crbug.com/472634 |
| 53 SkPaint layerPaint; | 53 SkPaint layerPaint; |
| 54 layerPaint.setXfermode(paint.getXfermode()); | 54 layerPaint.setXfermode(paint.getXfermode()); |
| 55 SkAutoCanvasRestore ar(canvas, false); | 55 SkAutoCanvasRestore ar(canvas, false); |
| 56 canvas->saveLayer(nullptr, &layerPaint); | 56 canvas->saveLayer(nullptr, &layerPaint); |
| 57 | 57 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 void CrossfadeGeneratedImage::drawTile(GraphicsContext* context, const FloatRect
& srcRect) | 90 void CrossfadeGeneratedImage::drawTile(GraphicsContext* context, const FloatRect
& srcRect) |
| 91 { | 91 { |
| 92 // Draw nothing if either of the images hasn't loaded yet. | 92 // Draw nothing if either of the images hasn't loaded yet. |
| 93 if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage()) | 93 if (m_fromImage == Image::nullImage() || m_toImage == Image::nullImage()) |
| 94 return; | 94 return; |
| 95 | 95 |
| 96 SkPaint paint = context->fillPaint(); | 96 SkPaint paint = context->fillPaint(); |
| 97 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); | 97 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); |
| 98 paint.setAntiAlias(context->shouldAntialias()); | 98 paint.setAntiAlias(context->shouldAntialias()); |
| 99 FloatRect destRect(FloatPoint(), m_crossfadeSize); | 99 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); |
| 100 paint.setFilterQuality(context->computeFilterQuality(this, destRect, srcRect
)); | 100 paint.setFilterQuality(context->computeFilterQuality(this, destRect, srcRect
)); |
| 101 drawCrossfade(context->canvas(), paint, ClampImageToSourceRect); | 101 drawCrossfade(context->canvas(), paint, ClampImageToSourceRect); |
| 102 } | 102 } |
| 103 | 103 |
| 104 } // namespace blink | 104 } // namespace blink |
| OLD | NEW |