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

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: 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
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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 294
296 SkPoint clip_points[4]; 295 SkPoint clip_points[4];
297 QuadFToSkPoints(local_draw_region, clip_points); 296 QuadFToSkPoints(local_draw_region, clip_points);
298 draw_region_clip_path.addPoly(clip_points, 4, true); 297 draw_region_clip_path.addPoly(clip_points, 4, true);
299 298
300 current_canvas_->clipPath(draw_region_clip_path, SkRegion::kIntersect_Op, 299 current_canvas_->clipPath(draw_region_clip_path, SkRegion::kIntersect_Op,
301 false); 300 false);
302 } 301 }
303 302
304 switch (quad->material) { 303 switch (quad->material) {
305 case DrawQuad::CHECKERBOARD:
306 // TODO(enne) For now since checkerboards shouldn't be part of a 3D
307 // context, clipping regions aren't supported so we skip drawing them
308 // if this becomes the case.
309 if (!draw_region) {
310 DrawCheckerboardQuad(frame, CheckerboardDrawQuad::MaterialCast(quad));
311 }
312 break;
313 case DrawQuad::DEBUG_BORDER: 304 case DrawQuad::DEBUG_BORDER:
314 DrawDebugBorderQuad(frame, DebugBorderDrawQuad::MaterialCast(quad)); 305 DrawDebugBorderQuad(frame, DebugBorderDrawQuad::MaterialCast(quad));
315 break; 306 break;
316 case DrawQuad::PICTURE_CONTENT: 307 case DrawQuad::PICTURE_CONTENT:
317 DrawPictureQuad(frame, PictureDrawQuad::MaterialCast(quad)); 308 DrawPictureQuad(frame, PictureDrawQuad::MaterialCast(quad));
318 break; 309 break;
319 case DrawQuad::RENDER_PASS: 310 case DrawQuad::RENDER_PASS:
320 DrawRenderPassQuad(frame, RenderPassDrawQuad::MaterialCast(quad)); 311 DrawRenderPassQuad(frame, RenderPassDrawQuad::MaterialCast(quad));
321 break; 312 break;
322 case DrawQuad::SOLID_COLOR: 313 case DrawQuad::SOLID_COLOR:
(...skipping 18 matching lines...) Expand all
341 NOTREACHED(); 332 NOTREACHED();
342 break; 333 break;
343 } 334 }
344 335
345 current_canvas_->resetMatrix(); 336 current_canvas_->resetMatrix();
346 if (draw_region) { 337 if (draw_region) {
347 current_canvas_->restore(); 338 current_canvas_->restore();
348 } 339 }
349 } 340 }
350 341
351 void SoftwareRenderer::DrawCheckerboardQuad(const DrawingFrame* frame,
352 const CheckerboardDrawQuad* quad) {
353 gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional(
354 QuadVertexRect(), quad->rect, quad->visible_rect);
355 current_paint_.setColor(quad->color);
356 current_paint_.setAlpha(quad->shared_quad_state->opacity);
357 current_canvas_->drawRect(gfx::RectFToSkRect(visible_quad_vertex_rect),
358 current_paint_);
359 }
360
361 void SoftwareRenderer::DrawDebugBorderQuad(const DrawingFrame* frame, 342 void SoftwareRenderer::DrawDebugBorderQuad(const DrawingFrame* frame,
362 const DebugBorderDrawQuad* quad) { 343 const DebugBorderDrawQuad* quad) {
363 // We need to apply the matrix manually to have pixel-sized stroke width. 344 // We need to apply the matrix manually to have pixel-sized stroke width.
364 SkPoint vertices[4]; 345 SkPoint vertices[4];
365 gfx::RectFToSkRect(QuadVertexRect()).toQuad(vertices); 346 gfx::RectFToSkRect(QuadVertexRect()).toQuad(vertices);
366 SkPoint transformed_vertices[4]; 347 SkPoint transformed_vertices[4];
367 current_canvas_->getTotalMatrix().mapPoints(transformed_vertices, 348 current_canvas_->getTotalMatrix().mapPoints(transformed_vertices,
368 vertices, 349 vertices,
369 4); 350 4);
370 current_canvas_->resetMatrix(); 351 current_canvas_->resetMatrix();
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 } 634 }
654 635
655 void SoftwareRenderer::DidChangeVisibility() { 636 void SoftwareRenderer::DidChangeVisibility() {
656 if (visible()) 637 if (visible())
657 EnsureBackbuffer(); 638 EnsureBackbuffer();
658 else 639 else
659 DiscardBackbuffer(); 640 DiscardBackbuffer();
660 } 641 }
661 642
662 } // namespace cc 643 } // namespace cc
OLDNEW
« cc/layers/layer.cc ('K') | « 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