OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "cc/software_renderer.h" | 7 #include "cc/software_renderer.h" |
8 | 8 |
9 #include "cc/debug_border_draw_quad.h" | 9 #include "cc/debug_border_draw_quad.h" |
10 #include "cc/render_pass_draw_quad.h" | 10 #include "cc/render_pass_draw_quad.h" |
11 #include "cc/solid_color_draw_quad.h" | 11 #include "cc/solid_color_draw_quad.h" |
12 #include "cc/texture_draw_quad.h" | 12 #include "cc/texture_draw_quad.h" |
13 #include "cc/tile_draw_quad.h" | 13 #include "cc/tile_draw_quad.h" |
14 #include "third_party/skia/include/core/SkCanvas.h" | 14 #include "third_party/skia/include/core/SkCanvas.h" |
15 #include "third_party/skia/include/core/SkColor.h" | 15 #include "third_party/skia/include/core/SkColor.h" |
16 #include "third_party/skia/include/core/SkMatrix.h" | 16 #include "third_party/skia/include/core/SkMatrix.h" |
17 #include "third_party/skia/include/core/SkShader.h" | 17 #include "third_party/skia/include/core/SkShader.h" |
18 #include "third_party/skia/include/effects/SkLayerRasterizer.h" | 18 #include "third_party/skia/include/effects/SkLayerRasterizer.h" |
19 #include "ui/gfx/rect_conversions.h" | 19 #include "ui/gfx/rect_conversions.h" |
| 20 #include <public/WebCompositorSoftwareOutputDevice.h> |
20 #include <public/WebImage.h> | 21 #include <public/WebImage.h> |
21 #include <public/WebSize.h> | 22 #include <public/WebSize.h> |
22 #include <public/WebTransformationMatrix.h> | 23 #include <public/WebTransformationMatrix.h> |
23 | 24 |
24 using WebKit::WebCompositorSoftwareOutputDevice; | 25 using WebKit::WebCompositorSoftwareOutputDevice; |
25 using WebKit::WebImage; | |
26 using WebKit::WebSize; | 26 using WebKit::WebSize; |
27 using WebKit::WebTransformationMatrix; | 27 using WebKit::WebTransformationMatrix; |
28 | 28 |
29 namespace cc { | 29 namespace cc { |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 SkRect toSkRect(const gfx::RectF& rect) | 33 SkRect toSkRect(const gfx::RectF& rect) |
34 { | 34 { |
35 return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height()); | 35 return SkRect::MakeXYWH(rect.x(), rect.y(), rect.width(), rect.height()); |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 | 248 |
249 void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD
rawQuad* quad) | 249 void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD
rawQuad* quad) |
250 { | 250 { |
251 if (!isSoftwareResource(quad->resourceId())) { | 251 if (!isSoftwareResource(quad->resourceId())) { |
252 drawUnsupportedQuad(frame, quad); | 252 drawUnsupportedQuad(frame, quad); |
253 return; | 253 return; |
254 } | 254 } |
255 | 255 |
256 // FIXME: Add support for non-premultiplied alpha. | 256 // FIXME: Add support for non-premultiplied alpha. |
257 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider
, quad->resourceId()); | 257 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider
, quad->resourceId()); |
| 258 const SkBitmap* bitmap = quadResourceLock.skBitmap(); |
258 gfx::RectF uvRect = quad->uvRect(); | 259 gfx::RectF uvRect = quad->uvRect(); |
259 uvRect.Scale(quad->quadRect().width(), quad->quadRect().height()); | 260 uvRect.Scale(bitmap->width(), bitmap->height()); |
260 SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect)); | 261 SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect)); |
261 if (quad->flipped()) | 262 if (quad->flipped()) |
262 m_skCurrentCanvas->scale(1, -1); | 263 m_skCurrentCanvas->scale(1, -1); |
263 m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &skUvRect, t
oSkRect(quadVertexRect()), &m_skCurrentPaint); | 264 m_skCurrentCanvas->drawBitmapRect(*bitmap, &skUvRect, toSkRect(quadVertexRec
t()), &m_skCurrentPaint); |
264 } | 265 } |
265 | 266 |
266 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua
d* quad) | 267 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua
d* quad) |
267 { | 268 { |
268 DCHECK(isSoftwareResource(quad->resourceId())); | 269 DCHECK(isSoftwareResource(quad->resourceId())); |
269 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider
, quad->resourceId()); | 270 ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider
, quad->resourceId()); |
270 | 271 |
271 SkIRect uvRect = toSkIRect(gfx::Rect(quad->textureOffset(), quad->quadRect()
.size())); | 272 SkIRect uvRect = toSkIRect(gfx::Rect(quad->textureOffset(), quad->quadRect()
.size())); |
272 m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &uvRect, toS
kRect(quadVertexRect()), &m_skCurrentPaint); | 273 m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &uvRect, toS
kRect(quadVertexRect()), &m_skCurrentPaint); |
273 } | 274 } |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 } | 350 } |
350 | 351 |
351 void SoftwareRenderer::setVisible(bool visible) | 352 void SoftwareRenderer::setVisible(bool visible) |
352 { | 353 { |
353 if (m_visible == visible) | 354 if (m_visible == visible) |
354 return; | 355 return; |
355 m_visible = visible; | 356 m_visible = visible; |
356 } | 357 } |
357 | 358 |
358 } | 359 } |
OLD | NEW |