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

Side by Side Diff: Source/platform/graphics/ImageBuffer.cpp

Issue 104023007: Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: mac+win build fix Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, Google Inc. All rights reserved. 2 * Copyright (c) 2008, Google Inc. All rights reserved.
3 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 3 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
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 are 7 * modification, are permitted provided that the following conditions are
8 * met: 8 * met:
9 * 9 *
10 * * Redistributions of source code must retain the above copyright 10 * * Redistributions of source code must retain the above copyright
(...skipping 19 matching lines...) Expand all
30 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */ 31 */
32 32
33 #include "config.h" 33 #include "config.h"
34 #include "platform/graphics/ImageBuffer.h" 34 #include "platform/graphics/ImageBuffer.h"
35 35
36 #include "platform/MIMETypeRegistry.h" 36 #include "platform/MIMETypeRegistry.h"
37 #include "platform/geometry/IntRect.h" 37 #include "platform/geometry/IntRect.h"
38 #include "platform/graphics/BitmapImage.h" 38 #include "platform/graphics/BitmapImage.h"
39 #include "platform/graphics/Extensions3D.h" 39 #include "platform/graphics/Extensions3D.h"
40 #include "platform/graphics/GraphicsContext.h"
40 #include "platform/graphics/GraphicsContext3D.h" 41 #include "platform/graphics/GraphicsContext3D.h"
42 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
41 #include "platform/graphics/gpu/DrawingBuffer.h" 43 #include "platform/graphics/gpu/DrawingBuffer.h"
42 #include "platform/graphics/gpu/SharedGraphicsContext3D.h" 44 #include "platform/graphics/gpu/SharedGraphicsContext3D.h"
43 #include "platform/graphics/skia/GaneshUtils.h"
44 #include "platform/graphics/skia/NativeImageSkia.h" 45 #include "platform/graphics/skia/NativeImageSkia.h"
45 #include "platform/graphics/skia/SkiaUtils.h" 46 #include "platform/graphics/skia/SkiaUtils.h"
46 #include "platform/image-encoders/skia/JPEGImageEncoder.h" 47 #include "platform/image-encoders/skia/JPEGImageEncoder.h"
47 #include "platform/image-encoders/skia/PNGImageEncoder.h" 48 #include "platform/image-encoders/skia/PNGImageEncoder.h"
48 #include "platform/image-encoders/skia/WEBPImageEncoder.h" 49 #include "platform/image-encoders/skia/WEBPImageEncoder.h"
49 #include "public/platform/Platform.h" 50 #include "public/platform/Platform.h"
50 #include "skia/ext/platform_canvas.h"
51 #include "third_party/skia/include/core/SkBitmapDevice.h"
52 #include "third_party/skia/include/core/SkColorFilter.h"
53 #include "third_party/skia/include/core/SkColorPriv.h"
54 #include "third_party/skia/include/core/SkSurface.h"
55 #include "third_party/skia/include/effects/SkTableColorFilter.h" 51 #include "third_party/skia/include/effects/SkTableColorFilter.h"
56 #include "third_party/skia/include/gpu/GrContext.h"
57 #include "third_party/skia/include/gpu/SkGpuDevice.h"
58 #include "third_party/skia/include/gpu/SkGrPixelRef.h"
59 #include "wtf/MathExtras.h" 52 #include "wtf/MathExtras.h"
60 #include "wtf/text/Base64.h" 53 #include "wtf/text/Base64.h"
61 #include "wtf/text/WTFString.h" 54 #include "wtf/text/WTFString.h"
62 55
63 using namespace std; 56 using namespace std;
64 57
65 namespace WebCore { 58 namespace WebCore {
66 59
67 static PassRefPtr<SkCanvas> createAcceleratedCanvas(const IntSize& size, Canvas2 DLayerBridgePtr* outLayerBridge, OpacityMode opacityMode, int msaaSampleCount) 60 PassOwnPtr<ImageBuffer> ImageBuffer::create(PassOwnPtr<ImageBufferSurface> surfa ce)
68 { 61 {
69 RefPtr<GraphicsContext3D> context3D = SharedGraphicsContext3D::get(); 62 if (!surface->isValid())
70 if (!context3D) 63 return nullptr;
71 return 0; 64 return adoptPtr(new ImageBuffer(surface));
72 Canvas2DLayerBridge::OpacityMode bridgeOpacityMode = opacityMode == Opaque ? Canvas2DLayerBridge::Opaque : Canvas2DLayerBridge::NonOpaque;
73 *outLayerBridge = Canvas2DLayerBridge::create(context3D.release(), size, bri dgeOpacityMode, msaaSampleCount);
74 // If canvas buffer allocation failed, debug build will have asserted
75 // For release builds, we must verify whether the device has a render target
76 return (*outLayerBridge) ? (*outLayerBridge)->getCanvas() : 0;
77 } 65 }
78 66
79 static PassRefPtr<SkCanvas> createTextureBackedCanvas(const IntSize& size) 67 PassOwnPtr<ImageBuffer> ImageBuffer::create(const IntSize& size, OpacityMode opa cityMode)
80 { 68 {
81 RefPtr<GraphicsContext3D> context3D = SharedGraphicsContext3D::get(); 69 OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSu rface(size, opacityMode));
82 if (!context3D) 70 if (!surface->isValid())
83 return 0; 71 return nullptr;
84 GrContext* gr = context3D->grContext(); 72 return adoptPtr(new ImageBuffer(surface.release()));
85 if (!gr)
86 return 0;
87 SkBitmap* bitmap = new SkBitmap;
88 if (!bitmap || !ensureTextureBackedSkBitmap(gr, *bitmap, size, kDefault_GrSu rfaceOrigin, kRGBA_8888_GrPixelConfig))
89 return 0;
90 return adoptRef(new SkCanvas(*bitmap));
91 } 73 }
92 74
93 static PassRefPtr<SkCanvas> createNonPlatformCanvas(const IntSize& size) 75 ImageBuffer::ImageBuffer(PassOwnPtr<ImageBufferSurface> surface)
76 : m_surface(surface)
94 { 77 {
95 SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(SkBitmap::kARGB_8888_Co nfig, size.width(), size.height())); 78 if (m_surface->canvas()) {
96 SkPixelRef* pixelRef = device->accessBitmap(false).pixelRef(); 79 m_context = adoptPtr(new GraphicsContext(m_surface->canvas()));
97 return adoptRef(pixelRef ? new SkCanvas(device) : 0); 80 m_context->setCertainlyOpaque(m_surface->opacityMode() == Opaque);
98 } 81 m_context->setAccelerated(m_surface->isAccelerated());
99
100 PassOwnPtr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const IntSize& size, float resolutionScale, const GraphicsContext* context, bool hasAlpha)
101 {
102 bool success = false;
103 OwnPtr<ImageBuffer> buf = adoptPtr(new ImageBuffer(size, resolutionScale, co ntext, hasAlpha, success));
104 if (!success)
105 return nullptr;
106 return buf.release();
107 }
108
109 PassOwnPtr<ImageBuffer> ImageBuffer::createBufferForTile(const FloatSize& tileSi ze, const FloatSize& clampedTileSize, RenderingMode renderingMode)
110 {
111 IntSize imageSize(roundedIntSize(clampedTileSize));
112 IntSize unclampedImageSize(roundedIntSize(tileSize));
113
114 // Don't create empty ImageBuffers.
115 if (imageSize.isEmpty())
116 return nullptr;
117
118 OwnPtr<ImageBuffer> image = ImageBuffer::create(imageSize, 1, renderingMode) ;
119 if (!image)
120 return nullptr;
121
122 GraphicsContext* imageContext = image->context();
123 ASSERT(imageContext);
124
125 // Compensate rounding effects, as the absolute target rect is using floatin g-point numbers and the image buffer size is integer.
126 imageContext->scale(FloatSize(unclampedImageSize.width() / tileSize.width(), unclampedImageSize.height() / tileSize.height()));
127
128 return image.release();
129 }
130
131 ImageBuffer::ImageBuffer(const IntSize& size, float resolutionScale, const Graph icsContext* compatibleContext, bool hasAlpha, bool& success)
132 : m_size(size)
133 , m_logicalSize(size)
134 , m_resolutionScale(resolutionScale)
135 {
136 if (!compatibleContext) {
137 success = false;
138 return;
139 } 82 }
140
141 SkAutoTUnref<SkBaseDevice> device(compatibleContext->createCompatibleDevice( size, hasAlpha));
142 if (!device.get()) {
143 success = false;
144 return;
145 }
146
147 SkPixelRef* pixelRef = device->accessBitmap(false).pixelRef();
148 if (!pixelRef) {
149 success = false;
150 return;
151 }
152
153 m_canvas = adoptRef(new SkCanvas(device));
154 m_context = adoptPtr(new GraphicsContext(m_canvas.get()));
155 m_context->setCertainlyOpaque(!hasAlpha);
156 m_context->scale(FloatSize(m_resolutionScale, m_resolutionScale));
157
158 success = true;
159 }
160
161 ImageBuffer::ImageBuffer(const IntSize& size, float resolutionScale, RenderingMo de renderingMode, OpacityMode opacityMode, int acceleratedSampleCount, bool& suc cess)
162 : m_size(size)
163 , m_logicalSize(size)
164 , m_resolutionScale(resolutionScale)
165 {
166 if (renderingMode == Accelerated) {
167 m_canvas = createAcceleratedCanvas(size, &m_layerBridge, opacityMode, ac celeratedSampleCount);
168 if (!m_canvas)
169 renderingMode = UnacceleratedNonPlatformBuffer;
170 }
171
172 if (renderingMode == TextureBacked) {
173 m_canvas = createTextureBackedCanvas(size);
174 if (!m_canvas)
175 renderingMode = UnacceleratedNonPlatformBuffer;
176 }
177
178 if (renderingMode == UnacceleratedNonPlatformBuffer)
179 m_canvas = createNonPlatformCanvas(size);
180
181 if (!m_canvas)
182 m_canvas = adoptRef(skia::TryCreateBitmapCanvas(size.width(), size.heigh t(), false));
183
184 if (!m_canvas) {
185 success = false;
186 return;
187 }
188
189 m_context = adoptPtr(new GraphicsContext(m_canvas.get()));
190 m_context->setCertainlyOpaque(opacityMode == Opaque);
191 m_context->setAccelerated(renderingMode == Accelerated);
192 m_context->scale(FloatSize(m_resolutionScale, m_resolutionScale));
193
194 // Clear the background transparent or opaque, as required. It would be nice if this wasn't
195 // required, but the canvas is currently filled with the magic transparency
196 // color. Can we have another way to manage this?
197 if (renderingMode != TextureBacked) {
198 if (opacityMode == Opaque)
199 m_canvas->drawARGB(255, 0, 0, 0, SkXfermode::kSrc_Mode);
200 else
201 m_canvas->drawARGB(0, 0, 0, 0, SkXfermode::kClear_Mode);
202 }
203
204 success = true;
205 } 83 }
206 84
207 ImageBuffer::~ImageBuffer() 85 ImageBuffer::~ImageBuffer()
208 { 86 {
209 } 87 }
210 88
211 GraphicsContext* ImageBuffer::context() const 89 GraphicsContext* ImageBuffer::context() const
212 { 90 {
213 if (m_layerBridge) { 91 m_surface->aboutToUse();
214 // We're using context acquisition as a signal that someone is about to render into our buffer and we need
215 // to be ready. This isn't logically const-correct, hence the cast.
216 const_cast<Canvas2DLayerBridge*>(m_layerBridge.get())->contextAcquired() ;
217 }
218 return m_context.get(); 92 return m_context.get();
219 } 93 }
220 94
221 95
222 bool ImageBuffer::isValid() const 96 bool ImageBuffer::isValid() const
223 { 97 {
224 if (m_layerBridge) 98 return m_surface->isValid();
225 return const_cast<Canvas2DLayerBridge*>(m_layerBridge.get())->isValid();
226 return true;
227 } 99 }
228 100
229 static SkBitmap deepSkBitmapCopy(const SkBitmap& bitmap) 101 static SkBitmap deepSkBitmapCopy(const SkBitmap& bitmap)
230 { 102 {
231 SkBitmap tmp; 103 SkBitmap tmp;
232 if (!bitmap.deepCopyTo(&tmp, bitmap.config())) 104 if (!bitmap.deepCopyTo(&tmp, bitmap.config()))
233 bitmap.copyTo(&tmp, bitmap.config()); 105 bitmap.copyTo(&tmp, bitmap.config());
234 106
235 return tmp; 107 return tmp;
236 } 108 }
237 109
238 PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBeh avior) const 110 PassRefPtr<Image> ImageBuffer::copyImage(BackingStoreCopy copyBehavior, ScaleBeh avior) const
239 { 111 {
240 if (!isValid()) 112 if (!isValid())
241 return BitmapImage::create(NativeImageSkia::create()); 113 return BitmapImage::create(NativeImageSkia::create());
242 114
243 const SkBitmap& bitmap = *context()->bitmap(); 115 const SkBitmap& bitmap = m_surface->bitmap();
244 // FIXME: Start honoring ScaleBehavior to scale 2x buffers down to 1x. 116 return BitmapImage::create(NativeImageSkia::create(copyBehavior == CopyBacki ngStore ? deepSkBitmapCopy(bitmap) : bitmap));
245 return BitmapImage::create(NativeImageSkia::create(copyBehavior == CopyBacki ngStore ? deepSkBitmapCopy(bitmap) : bitmap, m_resolutionScale));
246 } 117 }
247 118
248 BackingStoreCopy ImageBuffer::fastCopyImageMode() 119 BackingStoreCopy ImageBuffer::fastCopyImageMode()
249 { 120 {
250 return DontCopyBackingStore; 121 return DontCopyBackingStore;
251 } 122 }
252 123
253 blink::WebLayer* ImageBuffer::platformLayer() const 124 blink::WebLayer* ImageBuffer::platformLayer() const
254 { 125 {
255 return m_layerBridge ? m_layerBridge->layer() : 0; 126 return m_surface->layer();
256 } 127 }
257 128
258 bool ImageBuffer::copyToPlatformTexture(GraphicsContext3D& context, Platform3DOb ject texture, GC3Denum internalFormat, GC3Denum destType, GC3Dint level, bool pr emultiplyAlpha, bool flipY) 129 bool ImageBuffer::copyToPlatformTexture(GraphicsContext3D& context, Platform3DOb ject texture, GC3Denum internalFormat, GC3Denum destType, GC3Dint level, bool pr emultiplyAlpha, bool flipY)
259 { 130 {
260 if (!m_layerBridge || !platformLayer() || !isValid()) 131 if (!m_surface->isAccelerated() || !platformLayer() || !isValid())
261 return false; 132 return false;
262 133
263 Platform3DObject sourceTexture = m_layerBridge->backBufferTexture();
264
265 if (!context.makeContextCurrent()) 134 if (!context.makeContextCurrent())
266 return false; 135 return false;
267 136
268 Extensions3D* extensions = context.extensions(); 137 Extensions3D* extensions = context.extensions();
269 if (!extensions->supports("GL_CHROMIUM_copy_texture") || !extensions->suppor ts("GL_CHROMIUM_flipy") 138 if (!extensions->supports("GL_CHROMIUM_copy_texture") || !extensions->suppor ts("GL_CHROMIUM_flipy")
270 || !extensions->canUseCopyTextureCHROMIUM(internalFormat, destType, leve l)) 139 || !extensions->canUseCopyTextureCHROMIUM(internalFormat, destType, leve l))
271 return false; 140 return false;
272 141
273 // The canvas is stored in a premultiplied format, so unpremultiply if neces sary. 142 // The canvas is stored in a premultiplied format, so unpremultiply if neces sary.
274 context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, !prem ultiplyAlpha); 143 context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, !prem ultiplyAlpha);
275 144
276 // The canvas is stored in an inverted position, so the flip semantics are r eversed. 145 // The canvas is stored in an inverted position, so the flip semantics are r eversed.
277 context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, !flipY); 146 context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, !flipY);
278 147 extensions->copyTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, getBackingTex ture(), texture, level, internalFormat, destType);
279 extensions->copyTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, sourceTexture , texture, level, internalFormat, destType);
280 148
281 context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, false); 149 context.pixelStorei(Extensions3D::UNPACK_FLIP_Y_CHROMIUM, false);
282 context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false ); 150 context.pixelStorei(Extensions3D::UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM, false );
283 context.flush(); 151 context.flush();
284 return true; 152 return true;
285 } 153 }
286 154
287 static bool drawNeedsCopy(GraphicsContext* src, GraphicsContext* dst) 155 static bool drawNeedsCopy(GraphicsContext* src, GraphicsContext* dst)
288 { 156 {
157 ASSERT(dst);
289 return (src == dst); 158 return (src == dst);
290 } 159 }
291 160
292 Platform3DObject ImageBuffer::getBackingTexture() 161 Platform3DObject ImageBuffer::getBackingTexture()
293 { 162 {
294 if (!m_context || !m_context->bitmap()) 163 return m_surface->getBackingTexture();
295 return 0;
296 const SkBitmap& bitmap = *m_context->bitmap();
297 if (bitmap.getTexture())
298 return (bitmap.getTexture())->getTextureHandle();
299 return 0;
300 } 164 }
301 165
302 bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu ffer) 166 bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu ffer)
303 { 167 {
304 if (!drawingBuffer) 168 if (!drawingBuffer)
305 return false; 169 return false;
306 RefPtr<GraphicsContext3D> context3D = SharedGraphicsContext3D::get(); 170 RefPtr<GraphicsContext3D> context3D = SharedGraphicsContext3D::get();
307 Platform3DObject tex = getBackingTexture(); 171 Platform3DObject tex = m_surface->getBackingTexture();
308 if (!context3D || !tex) 172 if (!context3D || !tex)
309 return false; 173 return false;
310 174
311 return drawingBuffer->copyToPlatformTexture(*(context3D.get()), tex, Graphic sContext3D::RGBA, 175 return drawingBuffer->copyToPlatformTexture(*(context3D.get()), tex, Graphic sContext3D::RGBA,
312 GraphicsContext3D::UNSIGNED_BYTE, 0, true, false); 176 GraphicsContext3D::UNSIGNED_BYTE, 0, true, false);
313 } 177 }
314 178
315 void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, cons t FloatRect& srcRect, 179 void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, cons t FloatRect& srcRect,
316 CompositeOperator op, blink::WebBlendMode blendMode, bool useLowQualityScale ) 180 CompositeOperator op, blink::WebBlendMode blendMode, bool useLowQualityScale )
317 { 181 {
318 if (!isValid()) 182 if (!isValid())
319 return; 183 return;
320 184
321 const SkBitmap& bitmap = *m_context->bitmap(); 185 const SkBitmap& bitmap = m_surface->bitmap();
322 RefPtr<Image> image = BitmapImage::create(NativeImageSkia::create(drawNeedsC opy(m_context.get(), context) ? deepSkBitmapCopy(bitmap) : bitmap)); 186 RefPtr<Image> image = BitmapImage::create(NativeImageSkia::create(drawNeedsC opy(m_context.get(), context) ? deepSkBitmapCopy(bitmap) : bitmap));
323 context->drawImage(image.get(), destRect, srcRect, op, blendMode, DoNotRespe ctImageOrientation, useLowQualityScale); 187 context->drawImage(image.get(), destRect, srcRect, op, blendMode, DoNotRespe ctImageOrientation, useLowQualityScale);
324 } 188 }
325 189
326 void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect , const FloatSize& scale, 190 void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect , const FloatSize& scale,
327 const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect, bl ink::WebBlendMode blendMode, const IntSize& repeatSpacing) 191 const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect, bl ink::WebBlendMode blendMode, const IntSize& repeatSpacing)
328 { 192 {
329 if (!isValid()) 193 if (!isValid())
330 return; 194 return;
331 195
332 const SkBitmap& bitmap = *m_context->bitmap(); 196 const SkBitmap& bitmap = m_surface->bitmap();
333 RefPtr<Image> image = BitmapImage::create(NativeImageSkia::create(drawNeedsC opy(m_context.get(), context) ? deepSkBitmapCopy(bitmap) : bitmap)); 197 RefPtr<Image> image = BitmapImage::create(NativeImageSkia::create(drawNeedsC opy(m_context.get(), context) ? deepSkBitmapCopy(bitmap) : bitmap));
334 image->drawPattern(context, srcRect, scale, phase, op, destRect, blendMode, repeatSpacing); 198 image->drawPattern(context, srcRect, scale, phase, op, destRect, blendMode, repeatSpacing);
335 } 199 }
336 200
337 static const Vector<uint8_t>& getLinearRgbLUT() 201 static const Vector<uint8_t>& getLinearRgbLUT()
338 { 202 {
339 DEFINE_STATIC_LOCAL(Vector<uint8_t>, linearRgbLUT, ()); 203 DEFINE_STATIC_LOCAL(Vector<uint8_t>, linearRgbLUT, ());
340 if (linearRgbLUT.isEmpty()) { 204 if (linearRgbLUT.isEmpty()) {
341 linearRgbLUT.reserveCapacity(256); 205 linearRgbLUT.reserveCapacity(256);
342 for (unsigned i = 0; i < 256; i++) { 206 for (unsigned i = 0; i < 256; i++) {
(...skipping 30 matching lines...) Expand all
373 237
374 // only sRGB <-> linearRGB are supported at the moment 238 // only sRGB <-> linearRGB are supported at the moment
375 if ((srcColorSpace != ColorSpaceLinearRGB && srcColorSpace != ColorSpaceDevi ceRGB) 239 if ((srcColorSpace != ColorSpaceLinearRGB && srcColorSpace != ColorSpaceDevi ceRGB)
376 || (dstColorSpace != ColorSpaceLinearRGB && dstColorSpace != ColorSpaceD eviceRGB)) 240 || (dstColorSpace != ColorSpaceLinearRGB && dstColorSpace != ColorSpaceD eviceRGB))
377 return; 241 return;
378 242
379 // FIXME: Disable color space conversions on accelerated canvases (for now). 243 // FIXME: Disable color space conversions on accelerated canvases (for now).
380 if (context()->isAccelerated() || !isValid()) 244 if (context()->isAccelerated() || !isValid())
381 return; 245 return;
382 246
383 const SkBitmap& bitmap = *context()->bitmap(); 247 const SkBitmap& bitmap = m_surface->bitmap();
384 if (bitmap.isNull()) 248 if (bitmap.isNull())
385 return; 249 return;
386 250
387 const Vector<uint8_t>& lookUpTable = dstColorSpace == ColorSpaceLinearRGB ? 251 const Vector<uint8_t>& lookUpTable = dstColorSpace == ColorSpaceLinearRGB ?
388 getLinearRgbLUT() : getDeviceRgbLUT(); 252 getLinearRgbLUT() : getDeviceRgbLUT();
389 253
390 ASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config); 254 ASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config);
255 IntSize size = m_surface->size();
391 SkAutoLockPixels bitmapLock(bitmap); 256 SkAutoLockPixels bitmapLock(bitmap);
392 for (int y = 0; y < m_size.height(); ++y) { 257 for (int y = 0; y < size.height(); ++y) {
393 uint32_t* srcRow = bitmap.getAddr32(0, y); 258 uint32_t* srcRow = bitmap.getAddr32(0, y);
394 for (int x = 0; x < m_size.width(); ++x) { 259 for (int x = 0; x < size.width(); ++x) {
395 SkColor color = SkPMColorToColor(srcRow[x]); 260 SkColor color = SkPMColorToColor(srcRow[x]);
396 srcRow[x] = SkPreMultiplyARGB( 261 srcRow[x] = SkPreMultiplyARGB(
397 SkColorGetA(color), 262 SkColorGetA(color),
398 lookUpTable[SkColorGetR(color)], 263 lookUpTable[SkColorGetR(color)],
399 lookUpTable[SkColorGetG(color)], 264 lookUpTable[SkColorGetG(color)],
400 lookUpTable[SkColorGetB(color)]); 265 lookUpTable[SkColorGetB(color)]);
401 } 266 }
402 } 267 }
403 } 268 }
404 269
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 SkCanvas::Config8888 config8888; 311 SkCanvas::Config8888 config8888;
447 if (multiplied == Premultiplied) 312 if (multiplied == Premultiplied)
448 config8888 = SkCanvas::kRGBA_Premul_Config8888; 313 config8888 = SkCanvas::kRGBA_Premul_Config8888;
449 else 314 else
450 config8888 = SkCanvas::kRGBA_Unpremul_Config8888; 315 config8888 = SkCanvas::kRGBA_Unpremul_Config8888;
451 316
452 context->readPixels(&destBitmap, rect.x(), rect.y(), config8888); 317 context->readPixels(&destBitmap, rect.x(), rect.y(), config8888);
453 return result.release(); 318 return result.release();
454 } 319 }
455 320
456 PassRefPtr<Uint8ClampedArray> ImageBuffer::getUnmultipliedImageData(const IntRec t& rect, CoordinateSystem) const 321 PassRefPtr<Uint8ClampedArray> ImageBuffer::getUnmultipliedImageData(const IntRec t& rect) const
457 { 322 {
458 if (!isValid()) 323 if (!isValid())
459 return Uint8ClampedArray::create(rect.width() * rect.height() * 4); 324 return Uint8ClampedArray::create(rect.width() * rect.height() * 4);
460 return getImageData<Unmultiplied>(rect, context(), m_size); 325 return getImageData<Unmultiplied>(rect, context(), m_surface->size());
461 } 326 }
462 327
463 PassRefPtr<Uint8ClampedArray> ImageBuffer::getPremultipliedImageData(const IntRe ct& rect, CoordinateSystem) const 328 PassRefPtr<Uint8ClampedArray> ImageBuffer::getPremultipliedImageData(const IntRe ct& rect) const
464 { 329 {
465 if (!isValid()) 330 if (!isValid())
466 return Uint8ClampedArray::create(rect.width() * rect.height() * 4); 331 return Uint8ClampedArray::create(rect.width() * rect.height() * 4);
467 return getImageData<Premultiplied>(rect, context(), m_size); 332 return getImageData<Premultiplied>(rect, context(), m_surface->size());
468 } 333 }
469 334
470 void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, c onst IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint, CoordinateSystem) 335 void ImageBuffer::putByteArray(Multiply multiplied, Uint8ClampedArray* source, c onst IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint)
471 { 336 {
472 if (!isValid()) 337 if (!isValid())
473 return; 338 return;
474 339
475 ASSERT(sourceRect.width() > 0); 340 ASSERT(sourceRect.width() > 0);
476 ASSERT(sourceRect.height() > 0); 341 ASSERT(sourceRect.height() > 0);
477 342
478 int originX = sourceRect.x(); 343 int originX = sourceRect.x();
479 int destX = destPoint.x() + sourceRect.x(); 344 int destX = destPoint.x() + sourceRect.x();
480 ASSERT(destX >= 0); 345 ASSERT(destX >= 0);
481 ASSERT(destX < m_size.width()); 346 ASSERT(destX < m_surface->size().width());
482 ASSERT(originX >= 0); 347 ASSERT(originX >= 0);
483 ASSERT(originX < sourceRect.maxX()); 348 ASSERT(originX < sourceRect.maxX());
484 349
485 int endX = destPoint.x() + sourceRect.maxX(); 350 int endX = destPoint.x() + sourceRect.maxX();
486 ASSERT(endX <= m_size.width()); 351 ASSERT(endX <= m_surface->size().width());
487 352
488 int numColumns = endX - destX; 353 int numColumns = endX - destX;
489 354
490 int originY = sourceRect.y(); 355 int originY = sourceRect.y();
491 int destY = destPoint.y() + sourceRect.y(); 356 int destY = destPoint.y() + sourceRect.y();
492 ASSERT(destY >= 0); 357 ASSERT(destY >= 0);
493 ASSERT(destY < m_size.height()); 358 ASSERT(destY < m_surface->size().height());
494 ASSERT(originY >= 0); 359 ASSERT(originY >= 0);
495 ASSERT(originY < sourceRect.maxY()); 360 ASSERT(originY < sourceRect.maxY());
496 361
497 int endY = destPoint.y() + sourceRect.maxY(); 362 int endY = destPoint.y() + sourceRect.maxY();
498 ASSERT(endY <= m_size.height()); 363 ASSERT(endY <= m_surface->size().height());
499 int numRows = endY - destY; 364 int numRows = endY - destY;
500 365
501 unsigned srcBytesPerRow = 4 * sourceSize.width(); 366 unsigned srcBytesPerRow = 4 * sourceSize.width();
502 SkBitmap srcBitmap; 367 SkBitmap srcBitmap;
503 srcBitmap.setConfig(SkBitmap::kARGB_8888_Config, numColumns, numRows, srcByt esPerRow); 368 srcBitmap.setConfig(SkBitmap::kARGB_8888_Config, numColumns, numRows, srcByt esPerRow);
504 srcBitmap.setPixels(source->data() + originY * srcBytesPerRow + originX * 4) ; 369 srcBitmap.setPixels(source->data() + originY * srcBytesPerRow + originX * 4) ;
505 370
506 SkCanvas::Config8888 config8888; 371 SkCanvas::Config8888 config8888;
507 if (multiplied == Premultiplied) 372 if (multiplied == Premultiplied)
508 config8888 = SkCanvas::kRGBA_Premul_Config8888; 373 config8888 = SkCanvas::kRGBA_Premul_Config8888;
(...skipping 22 matching lines...) Expand all
531 return false; 396 return false;
532 } else { 397 } else {
533 if (!PNGImageEncoder::encode(source, encodedImage)) 398 if (!PNGImageEncoder::encode(source, encodedImage))
534 return false; 399 return false;
535 ASSERT(mimeType == "image/png"); 400 ASSERT(mimeType == "image/png");
536 } 401 }
537 402
538 return true; 403 return true;
539 } 404 }
540 405
541 String ImageBuffer::toDataURL(const String& mimeType, const double* quality, Coo rdinateSystem) const 406 String ImageBuffer::toDataURL(const String& mimeType, const double* quality) con st
542 { 407 {
543 ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType)); 408 ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
544 409
545 Vector<char> encodedImage; 410 Vector<char> encodedImage;
546 if (!isValid() || !encodeImage(*context()->bitmap(), mimeType, quality, &enc odedImage)) 411 if (!isValid() || !encodeImage(m_surface->bitmap(), mimeType, quality, &enco dedImage))
547 return "data:,"; 412 return "data:,";
548 Vector<char> base64Data; 413 Vector<char> base64Data;
549 base64Encode(encodedImage, base64Data); 414 base64Encode(encodedImage, base64Data);
550 415
551 return "data:" + mimeType + ";base64," + base64Data; 416 return "data:" + mimeType + ";base64," + base64Data;
552 } 417 }
553 418
554 String ImageDataToDataURL(const ImageDataBuffer& imageData, const String& mimeTy pe, const double* quality) 419 String ImageDataToDataURL(const ImageDataBuffer& imageData, const String& mimeTy pe, const double* quality)
555 { 420 {
556 ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType)); 421 ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
557 422
558 Vector<char> encodedImage; 423 Vector<char> encodedImage;
559 if (!encodeImage(imageData, mimeType, quality, &encodedImage)) 424 if (!encodeImage(imageData, mimeType, quality, &encodedImage))
560 return "data:,"; 425 return "data:,";
561 426
562 Vector<char> base64Data; 427 Vector<char> base64Data;
563 base64Encode(encodedImage, base64Data); 428 base64Encode(encodedImage, base64Data);
564 429
565 return "data:" + mimeType + ";base64," + base64Data; 430 return "data:" + mimeType + ";base64," + base64Data;
566 } 431 }
567 432
568 } // namespace WebCore 433 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698