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

Side by Side Diff: cc/software_renderer.cc

Issue 11362235: Added support for CSS filters to the software compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/software_renderer.h" 5 #include "cc/software_renderer.h"
6 6
7 #include "cc/debug_border_draw_quad.h" 7 #include "cc/debug_border_draw_quad.h"
8 #include "cc/render_pass_draw_quad.h" 8 #include "cc/render_pass_draw_quad.h"
9 #include "cc/solid_color_draw_quad.h" 9 #include "cc/solid_color_draw_quad.h"
10 #include "cc/texture_draw_quad.h" 10 #include "cc/texture_draw_quad.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 toSkRect(quadVertexRect()), 271 toSkRect(quadVertexRect()),
272 &m_skCurrentPaint); 272 &m_skCurrentPaint);
273 } 273 }
274 274
275 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad) 275 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad)
276 { 276 {
277 CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId ()); 277 CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId ());
278 if (!contentTexture || !contentTexture->id()) 278 if (!contentTexture || !contentTexture->id())
279 return; 279 return;
280 280
281 const RenderPass* renderPass = frame.renderPassesById->get(quad->renderPassI d());
282 DCHECK(renderPass);
283 if (!renderPass)
284 return;
285
281 DCHECK(isSoftwareResource(contentTexture->id())); 286 DCHECK(isSoftwareResource(contentTexture->id()));
282 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTex ture->id()); 287 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTex ture->id());
283 288
284 SkRect destRect = toSkRect(quadVertexRect()); 289 SkRect destRect = toSkRect(quadVertexRect());
285 290
286 const SkBitmap* content = lock.skBitmap(); 291 const SkBitmap* content = lock.skBitmap();
287 292
288 SkRect contentRect; 293 SkRect contentRect;
289 content->getBounds(&contentRect); 294 content->getBounds(&contentRect);
290 295
291 SkMatrix contentMat; 296 SkMatrix contentMat;
292 contentMat.setRectToRect(contentRect, destRect, SkMatrix::kFill_ScaleToFit); 297 contentMat.setRectToRect(contentRect, destRect, SkMatrix::kFill_ScaleToFit);
293 298
294 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(*content, 299 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(*content,
295 SkShader::kClamp_ TileMode, 300 SkShader::kClamp_ TileMode,
296 SkShader::kClamp_ TileMode)); 301 SkShader::kClamp_ TileMode));
297 shader->setLocalMatrix(contentMat); 302 shader->setLocalMatrix(contentMat);
298 m_skCurrentPaint.setShader(shader); 303 m_skCurrentPaint.setShader(shader);
299 304
305 SkImageFilter* filter = renderPass->filter();
306 if (filter)
307 m_skCurrentPaint.setImageFilter(filter);
Stephen White 2012/11/14 01:07:17 You'll only get non-NULL SkImageFIlters here when
slavi 2012/11/14 01:17:43 I know. And the plan is to always get a non-NULL S
308
300 if (quad->maskResourceId()) { 309 if (quad->maskResourceId()) {
301 ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, qu ad->maskResourceId()); 310 ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, qu ad->maskResourceId());
302 311
303 const SkBitmap* mask = maskLock.skBitmap(); 312 const SkBitmap* mask = maskLock.skBitmap();
304 313
305 SkRect maskRect = SkRect::MakeXYWH( 314 SkRect maskRect = SkRect::MakeXYWH(
306 quad->maskTexCoordOffsetX() * mask->width(), 315 quad->maskTexCoordOffsetX() * mask->width(),
307 quad->maskTexCoordOffsetY() * mask->height(), 316 quad->maskTexCoordOffsetY() * mask->height(),
308 quad->maskTexCoordScaleX() * mask->width(), 317 quad->maskTexCoordScaleX() * mask->width(),
309 quad->maskTexCoordScaleY() * mask->height()); 318 quad->maskTexCoordScaleY() * mask->height());
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 364 }
356 365
357 void SoftwareRenderer::setVisible(bool visible) 366 void SoftwareRenderer::setVisible(bool visible)
358 { 367 {
359 if (m_visible == visible) 368 if (m_visible == visible)
360 return; 369 return;
361 m_visible = visible; 370 m_visible = visible;
362 } 371 }
363 372
364 } // namespace cc 373 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698