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

Side by Side Diff: cc/output/software_renderer.cc

Issue 24090003: Enable general CSS filters in the software compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows crash Created 7 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 | « cc/output/renderer_pixeltest.cc ('k') | cc/test/data/blue_yellow_filter_chain.png » ('j') | 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/output/software_renderer.h" 5 #include "cc/output/software_renderer.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/base/math_util.h" 8 #include "cc/base/math_util.h"
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/output/compositor_frame_ack.h" 10 #include "cc/output/compositor_frame_ack.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 SkRect dest_rect = gfx::RectFToSkRect(QuadVertexRect()); 428 SkRect dest_rect = gfx::RectFToSkRect(QuadVertexRect());
429 SkRect dest_visible_rect = gfx::RectFToSkRect(MathUtil::ScaleRectProportional( 429 SkRect dest_visible_rect = gfx::RectFToSkRect(MathUtil::ScaleRectProportional(
430 QuadVertexRect(), quad->rect, quad->visible_rect)); 430 QuadVertexRect(), quad->rect, quad->visible_rect));
431 SkRect content_rect = SkRect::MakeWH(quad->rect.width(), quad->rect.height()); 431 SkRect content_rect = SkRect::MakeWH(quad->rect.width(), quad->rect.height());
432 432
433 SkMatrix content_mat; 433 SkMatrix content_mat;
434 content_mat.setRectToRect(content_rect, dest_rect, 434 content_mat.setRectToRect(content_rect, dest_rect,
435 SkMatrix::kFill_ScaleToFit); 435 SkMatrix::kFill_ScaleToFit);
436 436
437 const SkBitmap* content = lock.sk_bitmap(); 437 const SkBitmap* content = lock.sk_bitmap();
438 skia::RefPtr<SkShader> shader = skia::AdoptRef( 438
439 SkShader::CreateBitmapShader(*content, 439 SkBitmap filter_bitmap;
440 SkShader::kClamp_TileMode, 440 if (!quad->filters.IsEmpty()) {
441 SkShader::kClamp_TileMode)); 441 skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter(
442 quad->filters, content_texture->size());
443 // TODO(ajuma): In addition origin translation, the canvas should also be
444 // scaled to accomodate device pixel ratio and pinch zoom. See
445 // crbug.com/281516 and crbug.com/281518.
446 // TODO(ajuma): Apply the filter in the same pass as the content where
447 // possible (e.g. when there's no origin offset). See crbug.com/308201.
448 if (filter) {
449 bool is_opaque = false;
450 skia::RefPtr<SkBaseDevice> device =
451 skia::AdoptRef(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
ajuma 2013/10/31 17:36:10 Using createCompatibleDevice leads to a crash on W
452 content_texture->size().width(),
453 content_texture->size().height(),
454 is_opaque));
455 SkCanvas canvas(device.get());
456 SkPaint paint;
457 paint.setImageFilter(filter.get());
458 canvas.clear(SK_ColorTRANSPARENT);
459 canvas.translate(SkIntToScalar(-quad->rect.origin().x()),
460 SkIntToScalar(-quad->rect.origin().y()));
461 canvas.drawSprite(*content, 0, 0, &paint);
462 bool will_change_pixels = false;
463 filter_bitmap = device->accessBitmap(will_change_pixels);
464 }
465 }
466
467 skia::RefPtr<SkShader> shader;
468 if (filter_bitmap.isNull()) {
469 shader = skia::AdoptRef(SkShader::CreateBitmapShader(
470 *content, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
471 } else {
472 shader = skia::AdoptRef(SkShader::CreateBitmapShader(
473 filter_bitmap, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
474 }
442 shader->setLocalMatrix(content_mat); 475 shader->setLocalMatrix(content_mat);
443 current_paint_.setShader(shader.get()); 476 current_paint_.setShader(shader.get());
444 477
445 // TODO(ajuma): Remove this condition once general CSS filters are working
446 // correctly (http://crbug.com/160302), and add corresponding pixel tests.
447 if (quad->filters.HasReferenceFilter()) {
448 skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter(
449 quad->filters, content_texture->size());
450 if (filter)
451 current_paint_.setImageFilter(filter.get());
452 }
453
454 if (quad->mask_resource_id) { 478 if (quad->mask_resource_id) {
455 ResourceProvider::ScopedReadLockSoftware mask_lock(resource_provider_, 479 ResourceProvider::ScopedReadLockSoftware mask_lock(resource_provider_,
456 quad->mask_resource_id); 480 quad->mask_resource_id);
457 481
458 const SkBitmap* mask = mask_lock.sk_bitmap(); 482 const SkBitmap* mask = mask_lock.sk_bitmap();
459 483
460 SkRect mask_rect = SkRect::MakeXYWH( 484 SkRect mask_rect = SkRect::MakeXYWH(
461 quad->mask_uv_rect.x() * mask->width(), 485 quad->mask_uv_rect.x() * mask->width(),
462 quad->mask_uv_rect.y() * mask->height(), 486 quad->mask_uv_rect.y() * mask->height(),
463 quad->mask_uv_rect.width() * mask->width(), 487 quad->mask_uv_rect.width() * mask->width(),
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 EnsureBackbuffer(); 580 EnsureBackbuffer();
557 else 581 else
558 DiscardBackbuffer(); 582 DiscardBackbuffer();
559 } 583 }
560 584
561 void SoftwareRenderer::SetDiscardBackBufferWhenNotVisible(bool discard) { 585 void SoftwareRenderer::SetDiscardBackBufferWhenNotVisible(bool discard) {
562 // The software renderer always discards the backbuffer when not visible. 586 // The software renderer always discards the backbuffer when not visible.
563 } 587 }
564 588
565 } // namespace cc 589 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/test/data/blue_yellow_filter_chain.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698