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

Side by Side Diff: Source/core/platform/graphics/ImageBuffer.h

Issue 22596003: Fix background blending for some cases where it did not work at all. The fix adds the blendMode par… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: adding TestExpectation lines for rebaselining Created 7 years, 4 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 // FIXME: current implementations of this method have the restriction that t hey only work 128 // FIXME: current implementations of this method have the restriction that t hey only work
129 // with textures that are RGB or RGBA format, UNSIGNED_BYTE type and level 0 , as specified in 129 // with textures that are RGB or RGBA format, UNSIGNED_BYTE type and level 0 , as specified in
130 // Extensions3D::canUseCopyTextureCHROMIUM(). 130 // Extensions3D::canUseCopyTextureCHROMIUM().
131 bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, G C3Denum, GC3Dint, bool, bool); 131 bool copyToPlatformTexture(GraphicsContext3D&, Platform3DObject, GC3Denum, G C3Denum, GC3Dint, bool, bool);
132 132
133 private: 133 private:
134 bool isValid() const; 134 bool isValid() const;
135 135
136 void draw(GraphicsContext*, const FloatRect&, const FloatRect& = FloatRect(0 , 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNorm al, bool useLowQualityScale = false); 136 void draw(GraphicsContext*, const FloatRect&, const FloatRect& = FloatRect(0 , 0, -1, -1), CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNorm al, bool useLowQualityScale = false);
137 void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, CompositeOperator, const FloatRect&); 137 void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, CompositeOperator, const FloatRect&, BlendMode);
Horia Olaru 2013/08/07 21:31:44 I would like to move the BlendMode parameter in a
138 138
139 friend class GraphicsContext; 139 friend class GraphicsContext;
140 friend class GeneratedImage; 140 friend class GeneratedImage;
141 friend class CrossfadeGeneratedImage; 141 friend class CrossfadeGeneratedImage;
142 friend class GeneratorGeneratedImage; 142 friend class GeneratorGeneratedImage;
143 143
144 IntSize m_size; 144 IntSize m_size;
145 IntSize m_logicalSize; 145 IntSize m_logicalSize;
146 float m_resolutionScale; 146 float m_resolutionScale;
147 OwnPtr<SkCanvas> m_canvas; 147 OwnPtr<SkCanvas> m_canvas;
148 OwnPtr<GraphicsContext> m_context; 148 OwnPtr<GraphicsContext> m_context;
149 OwnPtr<Canvas2DLayerBridge> m_layerBridge; 149 OwnPtr<Canvas2DLayerBridge> m_layerBridge;
150 150
151 // This constructor will place its success into the given out-variable 151 // This constructor will place its success into the given out-variable
152 // so that create() knows when it should return failure. 152 // so that create() knows when it should return failure.
153 ImageBuffer(const IntSize&, float resolutionScale, RenderingMode, OpacityMod e, bool& success); 153 ImageBuffer(const IntSize&, float resolutionScale, RenderingMode, OpacityMod e, bool& success);
154 ImageBuffer(const IntSize&, float resolutionScale, const GraphicsContext*, b ool hasAlpha, bool& success); 154 ImageBuffer(const IntSize&, float resolutionScale, const GraphicsContext*, b ool hasAlpha, bool& success);
155 }; 155 };
156 156
157 String ImageDataToDataURL(const ImageData&, const String& mimeType, const double * quality); 157 String ImageDataToDataURL(const ImageData&, const String& mimeType, const double * quality);
158 158
159 } // namespace WebCore 159 } // namespace WebCore
160 160
161 #endif // ImageBuffer_h 161 #endif // ImageBuffer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698