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

Side by Side Diff: cc/quads/checkerboard_draw_quad.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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/quads/checkerboard_draw_quad.h ('k') | cc/quads/draw_quad_unittest.cc » ('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/quads/checkerboard_draw_quad.h" 5 #include "cc/quads/checkerboard_draw_quad.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/trace_event/trace_event_argument.h" 8 #include "base/trace_event/trace_event_argument.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 10
11 namespace cc { 11 namespace cc {
12 12
13 CheckerboardDrawQuad::CheckerboardDrawQuad() : color(0) {} 13 CheckerboardDrawQuad::CheckerboardDrawQuad() : color(0), scale(0.f) {
14 }
14 15
15 void CheckerboardDrawQuad::SetNew(const SharedQuadState* shared_quad_state, 16 void CheckerboardDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
16 const gfx::Rect& rect, 17 const gfx::Rect& rect,
17 const gfx::Rect& visible_rect, 18 const gfx::Rect& visible_rect,
18 SkColor color) { 19 SkColor color,
20 float scale) {
19 gfx::Rect opaque_rect = SkColorGetA(color) == 255 ? rect : gfx::Rect(); 21 gfx::Rect opaque_rect = SkColorGetA(color) == 255 ? rect : gfx::Rect();
20 bool needs_blending = false; 22 bool needs_blending = false;
21 DrawQuad::SetAll(shared_quad_state, DrawQuad::CHECKERBOARD, rect, opaque_rect, 23 DrawQuad::SetAll(shared_quad_state, DrawQuad::CHECKERBOARD, rect, opaque_rect,
22 visible_rect, needs_blending); 24 visible_rect, needs_blending);
23 this->color = color; 25 this->color = color;
26 this->scale = scale;
24 } 27 }
25 28
26 void CheckerboardDrawQuad::SetAll(const SharedQuadState* shared_quad_state, 29 void CheckerboardDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
27 const gfx::Rect& rect, 30 const gfx::Rect& rect,
28 const gfx::Rect& opaque_rect, 31 const gfx::Rect& opaque_rect,
29 const gfx::Rect& visible_rect, 32 const gfx::Rect& visible_rect,
30 bool needs_blending, 33 bool needs_blending,
31 SkColor color) { 34 SkColor color,
35 float scale) {
32 DrawQuad::SetAll(shared_quad_state, DrawQuad::CHECKERBOARD, rect, opaque_rect, 36 DrawQuad::SetAll(shared_quad_state, DrawQuad::CHECKERBOARD, rect, opaque_rect,
33 visible_rect, needs_blending); 37 visible_rect, needs_blending);
34 this->color = color; 38 this->color = color;
39 this->scale = scale;
35 } 40 }
36 41
37 void CheckerboardDrawQuad::IterateResources( 42 void CheckerboardDrawQuad::IterateResources(
38 const ResourceIteratorCallback& callback) {} 43 const ResourceIteratorCallback& callback) {}
39 44
40 const CheckerboardDrawQuad* CheckerboardDrawQuad::MaterialCast( 45 const CheckerboardDrawQuad* CheckerboardDrawQuad::MaterialCast(
41 const DrawQuad* quad) { 46 const DrawQuad* quad) {
42 DCHECK(quad->material == DrawQuad::CHECKERBOARD); 47 DCHECK(quad->material == DrawQuad::CHECKERBOARD);
43 return static_cast<const CheckerboardDrawQuad*>(quad); 48 return static_cast<const CheckerboardDrawQuad*>(quad);
44 } 49 }
45 50
46 void CheckerboardDrawQuad::ExtendValue( 51 void CheckerboardDrawQuad::ExtendValue(
47 base::trace_event::TracedValue* value) const { 52 base::trace_event::TracedValue* value) const {
48 value->SetInteger("color", color); 53 value->SetInteger("color", color);
54 value->SetDouble("scale", scale);
49 } 55 }
50 56
51 } // namespace cc 57 } // namespace cc
OLDNEW
« no previous file with comments | « cc/quads/checkerboard_draw_quad.h ('k') | cc/quads/draw_quad_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698