Chromium Code Reviews| 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/compositor_frame.h" | 7 #include "cc/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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 329 break; | 329 break; |
| 330 case cc::DrawQuad::TILED_CONTENT: | 330 case cc::DrawQuad::TILED_CONTENT: |
| 331 WriteParam(m, *cc::TileDrawQuad::MaterialCast(quad)); | 331 WriteParam(m, *cc::TileDrawQuad::MaterialCast(quad)); |
| 332 break; | 332 break; |
| 333 case cc::DrawQuad::STREAM_VIDEO_CONTENT: | 333 case cc::DrawQuad::STREAM_VIDEO_CONTENT: |
| 334 WriteParam(m, *cc::StreamVideoDrawQuad::MaterialCast(quad)); | 334 WriteParam(m, *cc::StreamVideoDrawQuad::MaterialCast(quad)); |
| 335 break; | 335 break; |
| 336 case cc::DrawQuad::YUV_VIDEO_CONTENT: | 336 case cc::DrawQuad::YUV_VIDEO_CONTENT: |
| 337 WriteParam(m, *cc::YUVVideoDrawQuad::MaterialCast(quad)); | 337 WriteParam(m, *cc::YUVVideoDrawQuad::MaterialCast(quad)); |
| 338 break; | 338 break; |
| 339 case cc::DrawQuad::PICTURE_CONTENT: | |
| 340 NOTREACHED(); | |
|
Leandro Graciá Gil
2013/03/13 20:30:38
Cannot write or read PictureDrawQuads because they
| |
| 341 break; | |
| 339 case cc::DrawQuad::INVALID: | 342 case cc::DrawQuad::INVALID: |
| 340 break; | 343 break; |
| 341 } | 344 } |
| 342 | 345 |
| 343 const cc::ScopedPtrVector<cc::SharedQuadState>& sqs_list = | 346 const cc::ScopedPtrVector<cc::SharedQuadState>& sqs_list = |
| 344 p.shared_quad_state_list; | 347 p.shared_quad_state_list; |
| 345 | 348 |
| 346 // This is an invalid index. | 349 // This is an invalid index. |
| 347 size_t bad_index = sqs_list.size(); | 350 size_t bad_index = sqs_list.size(); |
| 348 | 351 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 443 break; | 446 break; |
| 444 case cc::DrawQuad::TILED_CONTENT: | 447 case cc::DrawQuad::TILED_CONTENT: |
| 445 draw_quad = ReadDrawQuad<cc::TileDrawQuad>(m, iter); | 448 draw_quad = ReadDrawQuad<cc::TileDrawQuad>(m, iter); |
| 446 break; | 449 break; |
| 447 case cc::DrawQuad::STREAM_VIDEO_CONTENT: | 450 case cc::DrawQuad::STREAM_VIDEO_CONTENT: |
| 448 draw_quad = ReadDrawQuad<cc::StreamVideoDrawQuad>(m, iter); | 451 draw_quad = ReadDrawQuad<cc::StreamVideoDrawQuad>(m, iter); |
| 449 break; | 452 break; |
| 450 case cc::DrawQuad::YUV_VIDEO_CONTENT: | 453 case cc::DrawQuad::YUV_VIDEO_CONTENT: |
| 451 draw_quad = ReadDrawQuad<cc::YUVVideoDrawQuad>(m, iter); | 454 draw_quad = ReadDrawQuad<cc::YUVVideoDrawQuad>(m, iter); |
| 452 break; | 455 break; |
| 456 case cc::DrawQuad::PICTURE_CONTENT: | |
| 457 NOTREACHED(); | |
|
piman
2013/03/15 03:51:57
drive-by: Not NOTREACHED since a compromized rende
Leandro Graciá Gil
2013/03/19 17:30:07
Done.
| |
| 458 break; | |
| 453 case cc::DrawQuad::INVALID: | 459 case cc::DrawQuad::INVALID: |
| 454 break; | 460 break; |
| 455 } | 461 } |
| 456 if (!draw_quad) | 462 if (!draw_quad) |
| 457 return false; | 463 return false; |
| 458 | 464 |
| 459 size_t shared_quad_state_index; | 465 size_t shared_quad_state_index; |
| 460 if (!ReadParam(m, iter, &shared_quad_state_index) || | 466 if (!ReadParam(m, iter, &shared_quad_state_index) || |
| 461 shared_quad_state_index >= p->shared_quad_state_list.size()) | 467 shared_quad_state_index >= p->shared_quad_state_list.size()) |
| 462 return false; | 468 return false; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 522 break; | 528 break; |
| 523 case cc::DrawQuad::TILED_CONTENT: | 529 case cc::DrawQuad::TILED_CONTENT: |
| 524 LogParam(*cc::TileDrawQuad::MaterialCast(quad), l); | 530 LogParam(*cc::TileDrawQuad::MaterialCast(quad), l); |
| 525 break; | 531 break; |
| 526 case cc::DrawQuad::STREAM_VIDEO_CONTENT: | 532 case cc::DrawQuad::STREAM_VIDEO_CONTENT: |
| 527 LogParam(*cc::StreamVideoDrawQuad::MaterialCast(quad), l); | 533 LogParam(*cc::StreamVideoDrawQuad::MaterialCast(quad), l); |
| 528 break; | 534 break; |
| 529 case cc::DrawQuad::YUV_VIDEO_CONTENT: | 535 case cc::DrawQuad::YUV_VIDEO_CONTENT: |
| 530 LogParam(*cc::YUVVideoDrawQuad::MaterialCast(quad), l); | 536 LogParam(*cc::YUVVideoDrawQuad::MaterialCast(quad), l); |
| 531 break; | 537 break; |
| 538 case cc::DrawQuad::PICTURE_CONTENT: | |
| 539 NOTREACHED(); | |
| 540 break; | |
| 532 case cc::DrawQuad::INVALID: | 541 case cc::DrawQuad::INVALID: |
| 533 break; | 542 break; |
| 534 } | 543 } |
| 535 } | 544 } |
| 536 l->append("])"); | 545 l->append("])"); |
| 537 } | 546 } |
| 538 | 547 |
| 539 namespace { | 548 namespace { |
| 540 enum CompositorFrameType { | 549 enum CompositorFrameType { |
| 541 NO_FRAME, | 550 NO_FRAME, |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 679 l->append(", ["); | 688 l->append(", ["); |
| 680 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { | 689 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |
| 681 if (i) | 690 if (i) |
| 682 l->append(", "); | 691 l->append(", "); |
| 683 LogParam(*p.render_pass_list[i], l); | 692 LogParam(*p.render_pass_list[i], l); |
| 684 } | 693 } |
| 685 l->append("])"); | 694 l->append("])"); |
| 686 } | 695 } |
| 687 | 696 |
| 688 } // namespace IPC | 697 } // namespace IPC |
| OLD | NEW |