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

Side by Side Diff: content/common/cc_messages.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/common/cc_messages.h" 5 #include "content/common/cc_messages.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "cc/output/filter_operations.h" 8 #include "cc/output/filter_operations.h"
9 #include "cc/quads/largest_draw_quad.h" 9 #include "cc/quads/largest_draw_quad.h"
10 #include "content/public/common/common_param_traits.h" 10 #include "content/public/common/common_param_traits.h"
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 to_reserve += p.quad_list.size() * sizeof(cc::kLargestDrawQuad); 381 to_reserve += p.quad_list.size() * sizeof(cc::kLargestDrawQuad);
382 return to_reserve; 382 return to_reserve;
383 } 383 }
384 384
385 template <typename QuadType> 385 template <typename QuadType>
386 static cc::DrawQuad* ReadDrawQuad(const Message* m, 386 static cc::DrawQuad* ReadDrawQuad(const Message* m,
387 PickleIterator* iter, 387 PickleIterator* iter,
388 cc::RenderPass* render_pass) { 388 cc::RenderPass* render_pass) {
389 QuadType* quad = render_pass->CreateAndAppendDrawQuad<QuadType>(); 389 QuadType* quad = render_pass->CreateAndAppendDrawQuad<QuadType>();
390 if (!ReadParam(m, iter, quad)) 390 if (!ReadParam(m, iter, quad))
391 return NULL; 391 return nullptr;
392 return quad; 392 return quad;
393 } 393 }
394 394
395 bool ParamTraits<cc::RenderPass>::Read( 395 bool ParamTraits<cc::RenderPass>::Read(
396 const Message* m, PickleIterator* iter, param_type* p) { 396 const Message* m, PickleIterator* iter, param_type* p) {
397 cc::RenderPassId id(-1, -1); 397 cc::RenderPassId id(-1, -1);
398 gfx::Rect output_rect; 398 gfx::Rect output_rect;
399 gfx::Rect damage_rect; 399 gfx::Rect damage_rect;
400 gfx::Transform transform_to_root_target; 400 gfx::Transform transform_to_root_target;
401 bool has_transparent_background; 401 bool has_transparent_background;
(...skipping 12 matching lines...) Expand all
414 damage_rect, 414 damage_rect,
415 transform_to_root_target, 415 transform_to_root_target,
416 has_transparent_background); 416 has_transparent_background);
417 417
418 for (size_t i = 0; i < quad_list_size; ++i) { 418 for (size_t i = 0; i < quad_list_size; ++i) {
419 cc::DrawQuad::Material material; 419 cc::DrawQuad::Material material;
420 PickleIterator temp_iter = *iter; 420 PickleIterator temp_iter = *iter;
421 if (!ReadParam(m, &temp_iter, &material)) 421 if (!ReadParam(m, &temp_iter, &material))
422 return false; 422 return false;
423 423
424 cc::DrawQuad* draw_quad = NULL; 424 cc::DrawQuad* draw_quad = nullptr;
425 switch (material) { 425 switch (material) {
426 case cc::DrawQuad::CHECKERBOARD: 426 case cc::DrawQuad::CHECKERBOARD:
427 draw_quad = ReadDrawQuad<cc::CheckerboardDrawQuad>(m, iter, p); 427 draw_quad = ReadDrawQuad<cc::CheckerboardDrawQuad>(m, iter, p);
428 break; 428 break;
429 case cc::DrawQuad::DEBUG_BORDER: 429 case cc::DrawQuad::DEBUG_BORDER:
430 draw_quad = ReadDrawQuad<cc::DebugBorderDrawQuad>(m, iter, p); 430 draw_quad = ReadDrawQuad<cc::DebugBorderDrawQuad>(m, iter, p);
431 break; 431 break;
432 case cc::DrawQuad::IO_SURFACE_CONTENT: 432 case cc::DrawQuad::IO_SURFACE_CONTENT:
433 draw_quad = ReadDrawQuad<cc::IOSurfaceDrawQuad>(m, iter, p); 433 draw_quad = ReadDrawQuad<cc::IOSurfaceDrawQuad>(m, iter, p);
434 break; 434 break;
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 l->append(", "); 787 l->append(", ");
788 LogParam(p.size, l); 788 LogParam(p.size, l);
789 l->append(", "); 789 l->append(", ");
790 LogParam(p.damage_rect, l); 790 LogParam(p.damage_rect, l);
791 l->append(", "); 791 l->append(", ");
792 LogParam(p.bitmap_id, l); 792 LogParam(p.bitmap_id, l);
793 l->append(")"); 793 l->append(")");
794 } 794 }
795 795
796 } // namespace IPC 796 } // namespace IPC
OLDNEW
« no previous file with comments | « content/common/android/surface_texture_peer.cc ('k') | content/common/child_process_sandbox_support_impl_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698