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/public/platform/WebFilterOperations.h" | 9 #include "third_party/WebKit/public/platform/WebFilterOperations.h" |
10 #include "ui/gfx/transform.h" | 10 #include "ui/gfx/transform.h" |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 else if (p.gl_frame_data) | 619 else if (p.gl_frame_data) |
620 LogParam(*p.gl_frame_data, l); | 620 LogParam(*p.gl_frame_data, l); |
621 else if (p.software_frame_data) | 621 else if (p.software_frame_data) |
622 LogParam(*p.software_frame_data, l); | 622 LogParam(*p.software_frame_data, l); |
623 l->append(")"); | 623 l->append(")"); |
624 } | 624 } |
625 | 625 |
626 void ParamTraits<cc::CompositorFrameAck>::Write(Message* m, | 626 void ParamTraits<cc::CompositorFrameAck>::Write(Message* m, |
627 const param_type& p) { | 627 const param_type& p) { |
628 WriteParam(m, p.resources); | 628 WriteParam(m, p.resources); |
629 WriteParam(m, p.last_dib_id); | 629 WriteParam(m, p.last_software_frame_id); |
630 if (p.gl_frame_data) { | 630 if (p.gl_frame_data) { |
631 WriteParam(m, static_cast<int>(GL_FRAME)); | 631 WriteParam(m, static_cast<int>(GL_FRAME)); |
632 WriteParam(m, *p.gl_frame_data); | 632 WriteParam(m, *p.gl_frame_data); |
633 } else { | 633 } else { |
634 WriteParam(m, static_cast<int>(NO_FRAME)); | 634 WriteParam(m, static_cast<int>(NO_FRAME)); |
635 } | 635 } |
636 } | 636 } |
637 | 637 |
638 bool ParamTraits<cc::CompositorFrameAck>::Read(const Message* m, | 638 bool ParamTraits<cc::CompositorFrameAck>::Read(const Message* m, |
639 PickleIterator* iter, | 639 PickleIterator* iter, |
640 param_type* p) { | 640 param_type* p) { |
641 if (!ReadParam(m, iter, &p->resources)) | 641 if (!ReadParam(m, iter, &p->resources)) |
642 return false; | 642 return false; |
643 | 643 |
644 if (!ReadParam(m, iter, &p->last_dib_id)) | 644 if (!ReadParam(m, iter, &p->last_software_frame_id)) |
645 return false; | 645 return false; |
646 | 646 |
647 int compositor_frame_type; | 647 int compositor_frame_type; |
648 if (!ReadParam(m, iter, &compositor_frame_type)) | 648 if (!ReadParam(m, iter, &compositor_frame_type)) |
649 return false; | 649 return false; |
650 | 650 |
651 switch (compositor_frame_type) { | 651 switch (compositor_frame_type) { |
652 case NO_FRAME: | 652 case NO_FRAME: |
653 break; | 653 break; |
654 case GL_FRAME: | 654 case GL_FRAME: |
655 p->gl_frame_data.reset(new cc::GLFrameData()); | 655 p->gl_frame_data.reset(new cc::GLFrameData()); |
656 if (!ReadParam(m, iter, p->gl_frame_data.get())) | 656 if (!ReadParam(m, iter, p->gl_frame_data.get())) |
657 return false; | 657 return false; |
658 break; | 658 break; |
659 default: | 659 default: |
660 return false; | 660 return false; |
661 } | 661 } |
662 return true; | 662 return true; |
663 } | 663 } |
664 | 664 |
665 void ParamTraits<cc::CompositorFrameAck>::Log(const param_type& p, | 665 void ParamTraits<cc::CompositorFrameAck>::Log(const param_type& p, |
666 std::string* l) { | 666 std::string* l) { |
667 l->append("CompositorFrameAck("); | 667 l->append("CompositorFrameAck("); |
668 LogParam(p.resources, l); | 668 LogParam(p.resources, l); |
669 l->append(", "); | 669 l->append(", "); |
670 LogParam(p.last_dib_id, l); | 670 LogParam(p.last_software_frame_id, l); |
671 l->append(", "); | 671 l->append(", "); |
672 if (p.gl_frame_data) | 672 if (p.gl_frame_data) |
673 LogParam(*p.gl_frame_data, l); | 673 LogParam(*p.gl_frame_data, l); |
674 l->append(")"); | 674 l->append(")"); |
675 } | 675 } |
676 | 676 |
677 void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, | 677 void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, |
678 const param_type& p) { | 678 const param_type& p) { |
679 WriteParam(m, p.resource_list); | 679 WriteParam(m, p.resource_list); |
680 WriteParam(m, p.render_pass_list.size()); | 680 WriteParam(m, p.render_pass_list.size()); |
(...skipping 27 matching lines...) Expand all Loading... |
708 l->append(", ["); | 708 l->append(", ["); |
709 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { | 709 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |
710 if (i) | 710 if (i) |
711 l->append(", "); | 711 l->append(", "); |
712 LogParam(*p.render_pass_list[i], l); | 712 LogParam(*p.render_pass_list[i], l); |
713 } | 713 } |
714 l->append("])"); | 714 l->append("])"); |
715 } | 715 } |
716 | 716 |
717 } // namespace IPC | 717 } // namespace IPC |
OLD | NEW |