| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 { | 43 { |
| 44 FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size())); | 44 FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size())); |
| 45 FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size())); | 45 FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size())); |
| 46 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); | 46 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); |
| 47 | 47 |
| 48 // TODO(junov): The various effects encoded into paint should probably be ap
plied here | 48 // TODO(junov): The various effects encoded into paint should probably be ap
plied here |
| 49 // instead of inside the layer. This probably faulty behavior was maintaine
d in order | 49 // instead of inside the layer. This probably faulty behavior was maintaine
d in order |
| 50 // to preserve pre-existing behavior while refactoring this code. This shou
ld be | 50 // to preserve pre-existing behavior while refactoring this code. This shou
ld be |
| 51 // investigated further. crbug.com/472634 | 51 // investigated further. crbug.com/472634 |
| 52 SkPaint layerPaint; | 52 SkPaint layerPaint; |
| 53 layerPaint.setXfermode(paint.getXfermode()); | 53 layerPaint.setXfermode(sk_ref_sp(paint.getXfermode())); |
| 54 SkAutoCanvasRestore ar(canvas, false); | 54 SkAutoCanvasRestore ar(canvas, false); |
| 55 canvas->saveLayer(nullptr, &layerPaint); | 55 canvas->saveLayer(nullptr, &layerPaint); |
| 56 | 56 |
| 57 SkPaint imagePaint(paint); | 57 SkPaint imagePaint(paint); |
| 58 imagePaint.setXfermodeMode(SkXfermode::kSrcOver_Mode); | 58 imagePaint.setXfermodeMode(SkXfermode::kSrcOver_Mode); |
| 59 int imageAlpha = clampedAlphaForBlending(1 - m_percentage); | 59 int imageAlpha = clampedAlphaForBlending(1 - m_percentage); |
| 60 imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha); | 60 imagePaint.setAlpha(imageAlpha > 255 ? 255 : imageAlpha); |
| 61 imagePaint.setAntiAlias(paint.isAntiAlias()); | 61 imagePaint.setAntiAlias(paint.isAntiAlias()); |
| 62 // TODO(junov): This code should probably be propagating the RespectImageOri
entationEnum | 62 // TODO(junov): This code should probably be propagating the RespectImageOri
entationEnum |
| 63 // form CrossfadeGeneratedImage::draw. Code was written this way during refa
ctoring to | 63 // form CrossfadeGeneratedImage::draw. Code was written this way during refa
ctoring to |
| (...skipping 30 matching lines...) Expand all Loading... |
| 94 | 94 |
| 95 SkPaint paint = context.fillPaint(); | 95 SkPaint paint = context.fillPaint(); |
| 96 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); | 96 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); |
| 97 paint.setAntiAlias(context.shouldAntialias()); | 97 paint.setAntiAlias(context.shouldAntialias()); |
| 98 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); | 98 FloatRect destRect((FloatPoint()), FloatSize(m_crossfadeSize)); |
| 99 paint.setFilterQuality(context.computeFilterQuality(this, destRect, srcRect)
); | 99 paint.setFilterQuality(context.computeFilterQuality(this, destRect, srcRect)
); |
| 100 drawCrossfade(context.canvas(), paint, ClampImageToSourceRect); | 100 drawCrossfade(context.canvas(), paint, ClampImageToSourceRect); |
| 101 } | 101 } |
| 102 | 102 |
| 103 } // namespace blink | 103 } // namespace blink |
| OLD | NEW |