Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
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 23 matching lines...)
34 : GeneratedImage(size) 34 : GeneratedImage(size)
35 , m_fromImage(fromImage) 35 , m_fromImage(fromImage)
36 , m_toImage(toImage) 36 , m_toImage(toImage)
37 , m_percentage(percentage) 37 , m_percentage(percentage)
38 , m_crossfadeSize(crossfadeSize) 38 , m_crossfadeSize(crossfadeSize)
39 { 39 {
40 } 40 }
41 41
42 void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& pai nt, ImageClampingMode clampMode) 42 void CrossfadeGeneratedImage::drawCrossfade(SkCanvas* canvas, const SkPaint& pai nt, ImageClampingMode clampMode)
43 { 43 {
44 FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->size())); 44 FloatRect fromImageRect(FloatPoint(), FloatSize(m_fromImage->defaultConcrete ObjectSize()));
45 FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->size())); 45 FloatRect toImageRect(FloatPoint(), FloatSize(m_toImage->defaultConcreteObje ctSize()));
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(paint.getXfermode());
54 SkAutoCanvasRestore ar(canvas, false); 54 SkAutoCanvasRestore ar(canvas, false);
55 canvas->saveLayer(nullptr, &layerPaint); 55 canvas->saveLayer(nullptr, &layerPaint);
(...skipping 38 matching lines...)
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
OLDNEW

Powered by Google App Engine