| Index: cc/quads/render_pass.cc
|
| diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc
|
| index 535cb63f451b03a8c0d2457cbc89ee5f4384097e..61fcb255f348a0186ed2fef5f60711f0d908fdf5 100644
|
| --- a/cc/quads/render_pass.cc
|
| +++ b/cc/quads/render_pass.cc
|
| @@ -20,7 +20,7 @@ const size_t kDefaultNumQuadsToReserve = 128;
|
| namespace cc {
|
|
|
| void* RenderPass::Id::AsTracingId() const {
|
| - COMPILE_ASSERT(sizeof(size_t) <= sizeof(void*), // NOLINT(runtime/sizeof)
|
| + COMPILE_ASSERT(sizeof(size_t) <= sizeof(void*), // NOLINT
|
| size_t_bigger_than_pointer);
|
| return reinterpret_cast<void*>(base::HashPair(layer_id, index));
|
| }
|
| @@ -170,7 +170,7 @@ scoped_ptr<base::Value> RenderPass::AsValue() const {
|
| }
|
|
|
| SharedQuadState* RenderPass::CreateAndAppendSharedQuadState() {
|
| - shared_quad_state_list.push_back(SharedQuadState::Create());
|
| + shared_quad_state_list.push_back(make_scoped_ptr(new SharedQuadState));
|
| return shared_quad_state_list.back();
|
| }
|
|
|
|
|