OLD | NEW |
---|---|
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 "content/public/common/common_param_traits.h" | 8 #include "content/public/common/common_param_traits.h" |
9 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" | 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" |
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations .h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations .h" |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
313 switch (quad->material) { | 313 switch (quad->material) { |
314 case cc::DrawQuad::CHECKERBOARD: | 314 case cc::DrawQuad::CHECKERBOARD: |
315 WriteParam(m, *cc::CheckerboardDrawQuad::MaterialCast(quad)); | 315 WriteParam(m, *cc::CheckerboardDrawQuad::MaterialCast(quad)); |
316 break; | 316 break; |
317 case cc::DrawQuad::DEBUG_BORDER: | 317 case cc::DrawQuad::DEBUG_BORDER: |
318 WriteParam(m, *cc::DebugBorderDrawQuad::MaterialCast(quad)); | 318 WriteParam(m, *cc::DebugBorderDrawQuad::MaterialCast(quad)); |
319 break; | 319 break; |
320 case cc::DrawQuad::IO_SURFACE_CONTENT: | 320 case cc::DrawQuad::IO_SURFACE_CONTENT: |
321 WriteParam(m, *cc::IOSurfaceDrawQuad::MaterialCast(quad)); | 321 WriteParam(m, *cc::IOSurfaceDrawQuad::MaterialCast(quad)); |
322 break; | 322 break; |
323 case cc::DrawQuad::PICTURE_CONTENT: | |
324 NOTREACHED(); | |
danakj
2013/03/21 02:34:42
Instead of assert can you just not send the quad?
Leandro GraciĆ” Gil
2013/03/21 16:42:48
Done.
| |
325 break; | |
323 case cc::DrawQuad::TEXTURE_CONTENT: | 326 case cc::DrawQuad::TEXTURE_CONTENT: |
324 WriteParam(m, *cc::TextureDrawQuad::MaterialCast(quad)); | 327 WriteParam(m, *cc::TextureDrawQuad::MaterialCast(quad)); |
325 break; | 328 break; |
326 case cc::DrawQuad::RENDER_PASS: | 329 case cc::DrawQuad::RENDER_PASS: |
327 WriteParam(m, *cc::RenderPassDrawQuad::MaterialCast(quad)); | 330 WriteParam(m, *cc::RenderPassDrawQuad::MaterialCast(quad)); |
328 break; | 331 break; |
329 case cc::DrawQuad::SOLID_COLOR: | 332 case cc::DrawQuad::SOLID_COLOR: |
330 WriteParam(m, *cc::SolidColorDrawQuad::MaterialCast(quad)); | 333 WriteParam(m, *cc::SolidColorDrawQuad::MaterialCast(quad)); |
331 break; | 334 break; |
332 case cc::DrawQuad::TILED_CONTENT: | 335 case cc::DrawQuad::TILED_CONTENT: |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
427 switch (material) { | 430 switch (material) { |
428 case cc::DrawQuad::CHECKERBOARD: | 431 case cc::DrawQuad::CHECKERBOARD: |
429 draw_quad = ReadDrawQuad<cc::CheckerboardDrawQuad>(m, iter); | 432 draw_quad = ReadDrawQuad<cc::CheckerboardDrawQuad>(m, iter); |
430 break; | 433 break; |
431 case cc::DrawQuad::DEBUG_BORDER: | 434 case cc::DrawQuad::DEBUG_BORDER: |
432 draw_quad = ReadDrawQuad<cc::DebugBorderDrawQuad>(m, iter); | 435 draw_quad = ReadDrawQuad<cc::DebugBorderDrawQuad>(m, iter); |
433 break; | 436 break; |
434 case cc::DrawQuad::IO_SURFACE_CONTENT: | 437 case cc::DrawQuad::IO_SURFACE_CONTENT: |
435 draw_quad = ReadDrawQuad<cc::IOSurfaceDrawQuad>(m, iter); | 438 draw_quad = ReadDrawQuad<cc::IOSurfaceDrawQuad>(m, iter); |
436 break; | 439 break; |
440 case cc::DrawQuad::PICTURE_CONTENT: | |
441 NOTREACHED(); | |
442 return false; | |
437 case cc::DrawQuad::TEXTURE_CONTENT: | 443 case cc::DrawQuad::TEXTURE_CONTENT: |
438 draw_quad = ReadDrawQuad<cc::TextureDrawQuad>(m, iter); | 444 draw_quad = ReadDrawQuad<cc::TextureDrawQuad>(m, iter); |
439 break; | 445 break; |
440 case cc::DrawQuad::RENDER_PASS: | 446 case cc::DrawQuad::RENDER_PASS: |
441 draw_quad = ReadDrawQuad<cc::RenderPassDrawQuad>(m, iter); | 447 draw_quad = ReadDrawQuad<cc::RenderPassDrawQuad>(m, iter); |
442 break; | 448 break; |
443 case cc::DrawQuad::SOLID_COLOR: | 449 case cc::DrawQuad::SOLID_COLOR: |
444 draw_quad = ReadDrawQuad<cc::SolidColorDrawQuad>(m, iter); | 450 draw_quad = ReadDrawQuad<cc::SolidColorDrawQuad>(m, iter); |
445 break; | 451 break; |
446 case cc::DrawQuad::TILED_CONTENT: | 452 case cc::DrawQuad::TILED_CONTENT: |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
506 switch (quad->material) { | 512 switch (quad->material) { |
507 case cc::DrawQuad::CHECKERBOARD: | 513 case cc::DrawQuad::CHECKERBOARD: |
508 LogParam(*cc::CheckerboardDrawQuad::MaterialCast(quad), l); | 514 LogParam(*cc::CheckerboardDrawQuad::MaterialCast(quad), l); |
509 break; | 515 break; |
510 case cc::DrawQuad::DEBUG_BORDER: | 516 case cc::DrawQuad::DEBUG_BORDER: |
511 LogParam(*cc::DebugBorderDrawQuad::MaterialCast(quad), l); | 517 LogParam(*cc::DebugBorderDrawQuad::MaterialCast(quad), l); |
512 break; | 518 break; |
513 case cc::DrawQuad::IO_SURFACE_CONTENT: | 519 case cc::DrawQuad::IO_SURFACE_CONTENT: |
514 LogParam(*cc::IOSurfaceDrawQuad::MaterialCast(quad), l); | 520 LogParam(*cc::IOSurfaceDrawQuad::MaterialCast(quad), l); |
515 break; | 521 break; |
522 case cc::DrawQuad::PICTURE_CONTENT: | |
523 NOTREACHED(); | |
524 break; | |
516 case cc::DrawQuad::TEXTURE_CONTENT: | 525 case cc::DrawQuad::TEXTURE_CONTENT: |
517 LogParam(*cc::TextureDrawQuad::MaterialCast(quad), l); | 526 LogParam(*cc::TextureDrawQuad::MaterialCast(quad), l); |
518 break; | 527 break; |
519 case cc::DrawQuad::RENDER_PASS: | 528 case cc::DrawQuad::RENDER_PASS: |
520 LogParam(*cc::RenderPassDrawQuad::MaterialCast(quad), l); | 529 LogParam(*cc::RenderPassDrawQuad::MaterialCast(quad), l); |
521 break; | 530 break; |
522 case cc::DrawQuad::SOLID_COLOR: | 531 case cc::DrawQuad::SOLID_COLOR: |
523 LogParam(*cc::SolidColorDrawQuad::MaterialCast(quad), l); | 532 LogParam(*cc::SolidColorDrawQuad::MaterialCast(quad), l); |
524 break; | 533 break; |
525 case cc::DrawQuad::TILED_CONTENT: | 534 case cc::DrawQuad::TILED_CONTENT: |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
700 l->append(", ["); | 709 l->append(", ["); |
701 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { | 710 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |
702 if (i) | 711 if (i) |
703 l->append(", "); | 712 l->append(", "); |
704 LogParam(*p.render_pass_list[i], l); | 713 LogParam(*p.render_pass_list[i], l); |
705 } | 714 } |
706 l->append("])"); | 715 l->append("])"); |
707 } | 716 } |
708 | 717 |
709 } // namespace IPC | 718 } // namespace IPC |
OLD | NEW |