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

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

Issue 1271843005: cc: Remove code for drawing checkerboard quads, it's not used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rm-checkers: sizes Created 5 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
« no previous file with comments | « cc/output/shader.cc ('k') | cc/quads/checkerboard_draw_quad.h » ('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/trace_event/trace_event.h" 7 #include "base/trace_event/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"
11 #include "cc/output/compositor_frame_metadata.h" 11 #include "cc/output/compositor_frame_metadata.h"
12 #include "cc/output/copy_output_request.h" 12 #include "cc/output/copy_output_request.h"
13 #include "cc/output/output_surface.h" 13 #include "cc/output/output_surface.h"
14 #include "cc/output/render_surface_filters.h" 14 #include "cc/output/render_surface_filters.h"
15 #include "cc/output/software_output_device.h" 15 #include "cc/output/software_output_device.h"
16 #include "cc/quads/checkerboard_draw_quad.h"
17 #include "cc/quads/debug_border_draw_quad.h" 16 #include "cc/quads/debug_border_draw_quad.h"
18 #include "cc/quads/picture_draw_quad.h" 17 #include "cc/quads/picture_draw_quad.h"
19 #include "cc/quads/render_pass_draw_quad.h" 18 #include "cc/quads/render_pass_draw_quad.h"
20 #include "cc/quads/solid_color_draw_quad.h" 19 #include "cc/quads/solid_color_draw_quad.h"
21 #include "cc/quads/texture_draw_quad.h" 20 #include "cc/quads/texture_draw_quad.h"
22 #include "cc/quads/tile_draw_quad.h" 21 #include "cc/quads/tile_draw_quad.h"
23 #include "skia/ext/opacity_filter_canvas.h" 22 #include "skia/ext/opacity_filter_canvas.h"
24 #include "third_party/skia/include/core/SkCanvas.h" 23 #include "third_party/skia/include/core/SkCanvas.h"
25 #include "third_party/skia/include/core/SkColor.h" 24 #include "third_party/skia/include/core/SkColor.h"
26 #include "third_party/skia/include/core/SkImageFilter.h" 25 #include "third_party/skia/include/core/SkImageFilter.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 295
297 SkPoint clip_points[4]; 296 SkPoint clip_points[4];
298 QuadFToSkPoints(local_draw_region, clip_points); 297 QuadFToSkPoints(local_draw_region, clip_points);
299 draw_region_clip_path.addPoly(clip_points, 4, true); 298 draw_region_clip_path.addPoly(clip_points, 4, true);
300 299
301 current_canvas_->clipPath(draw_region_clip_path, SkRegion::kIntersect_Op, 300 current_canvas_->clipPath(draw_region_clip_path, SkRegion::kIntersect_Op,
302 false); 301 false);
303 } 302 }
304 303
305 switch (quad->material) { 304 switch (quad->material) {
306 case DrawQuad::CHECKERBOARD:
307 // TODO(enne) For now since checkerboards shouldn't be part of a 3D
308 // context, clipping regions aren't supported so we skip drawing them
309 // if this becomes the case.
310 if (!draw_region) {
311 DrawCheckerboardQuad(frame, CheckerboardDrawQuad::MaterialCast(quad));
312 }
313 break;
314 case DrawQuad::DEBUG_BORDER: 305 case DrawQuad::DEBUG_BORDER:
315 DrawDebugBorderQuad(frame, DebugBorderDrawQuad::MaterialCast(quad)); 306 DrawDebugBorderQuad(frame, DebugBorderDrawQuad::MaterialCast(quad));
316 break; 307 break;
317 case DrawQuad::PICTURE_CONTENT: 308 case DrawQuad::PICTURE_CONTENT:
318 DrawPictureQuad(frame, PictureDrawQuad::MaterialCast(quad)); 309 DrawPictureQuad(frame, PictureDrawQuad::MaterialCast(quad));
319 break; 310 break;
320 case DrawQuad::RENDER_PASS: 311 case DrawQuad::RENDER_PASS:
321 DrawRenderPassQuad(frame, RenderPassDrawQuad::MaterialCast(quad)); 312 DrawRenderPassQuad(frame, RenderPassDrawQuad::MaterialCast(quad));
322 break; 313 break;
323 case DrawQuad::SOLID_COLOR: 314 case DrawQuad::SOLID_COLOR:
(...skipping 18 matching lines...) Expand all
342 NOTREACHED(); 333 NOTREACHED();
343 break; 334 break;
344 } 335 }
345 336
346 current_canvas_->resetMatrix(); 337 current_canvas_->resetMatrix();
347 if (draw_region) { 338 if (draw_region) {
348 current_canvas_->restore(); 339 current_canvas_->restore();
349 } 340 }
350 } 341 }
351 342
352 void SoftwareRenderer::DrawCheckerboardQuad(const DrawingFrame* frame,
353 const CheckerboardDrawQuad* quad) {
354 gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional(
355 QuadVertexRect(), quad->rect, quad->visible_rect);
356 current_paint_.setColor(quad->color);
357 current_paint_.setAlpha(quad->shared_quad_state->opacity);
358 current_canvas_->drawRect(gfx::RectFToSkRect(visible_quad_vertex_rect),
359 current_paint_);
360 }
361
362 void SoftwareRenderer::DrawDebugBorderQuad(const DrawingFrame* frame, 343 void SoftwareRenderer::DrawDebugBorderQuad(const DrawingFrame* frame,
363 const DebugBorderDrawQuad* quad) { 344 const DebugBorderDrawQuad* quad) {
364 // We need to apply the matrix manually to have pixel-sized stroke width. 345 // We need to apply the matrix manually to have pixel-sized stroke width.
365 SkPoint vertices[4]; 346 SkPoint vertices[4];
366 gfx::RectFToSkRect(QuadVertexRect()).toQuad(vertices); 347 gfx::RectFToSkRect(QuadVertexRect()).toQuad(vertices);
367 SkPoint transformed_vertices[4]; 348 SkPoint transformed_vertices[4];
368 current_canvas_->getTotalMatrix().mapPoints(transformed_vertices, 349 current_canvas_->getTotalMatrix().mapPoints(transformed_vertices,
369 vertices, 350 vertices,
370 4); 351 4);
371 current_canvas_->resetMatrix(); 352 current_canvas_->resetMatrix();
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 } 635 }
655 636
656 void SoftwareRenderer::DidChangeVisibility() { 637 void SoftwareRenderer::DidChangeVisibility() {
657 if (visible()) 638 if (visible())
658 EnsureBackbuffer(); 639 EnsureBackbuffer();
659 else 640 else
660 DiscardBackbuffer(); 641 DiscardBackbuffer();
661 } 642 }
662 643
663 } // namespace cc 644 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/shader.cc ('k') | cc/quads/checkerboard_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698