| 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 "cc/ipc/cc_param_traits.h" | 5 #include "cc/ipc/cc_param_traits.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/numerics/safe_conversions.h" | 10 #include "base/numerics/safe_conversions.h" |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 l->append(", "); | 716 l->append(", "); |
| 717 if (p.gl_frame_data) | 717 if (p.gl_frame_data) |
| 718 LogParam(*p.gl_frame_data, l); | 718 LogParam(*p.gl_frame_data, l); |
| 719 l->append(")"); | 719 l->append(")"); |
| 720 } | 720 } |
| 721 | 721 |
| 722 void ParamTraits<cc::DelegatedFrameData>::Write(base::Pickle* m, | 722 void ParamTraits<cc::DelegatedFrameData>::Write(base::Pickle* m, |
| 723 const param_type& p) { | 723 const param_type& p) { |
| 724 DCHECK_NE(0u, p.render_pass_list.size()); | 724 DCHECK_NE(0u, p.render_pass_list.size()); |
| 725 | 725 |
| 726 size_t to_reserve = sizeof(p.device_scale_factor); | 726 size_t to_reserve = 0u; |
| 727 to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource); | 727 to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource); |
| 728 for (const auto& pass : p.render_pass_list) { | 728 for (const auto& pass : p.render_pass_list) { |
| 729 to_reserve += sizeof(size_t) * 2; | 729 to_reserve += sizeof(size_t) * 2; |
| 730 to_reserve += ReserveSizeForRenderPassWrite(*pass); | 730 to_reserve += ReserveSizeForRenderPassWrite(*pass); |
| 731 } | 731 } |
| 732 m->Reserve(to_reserve); | 732 m->Reserve(to_reserve); |
| 733 | 733 |
| 734 WriteParam(m, p.device_scale_factor); | |
| 735 WriteParam(m, p.resource_list); | 734 WriteParam(m, p.resource_list); |
| 736 WriteParam(m, base::checked_cast<uint32_t>(p.render_pass_list.size())); | 735 WriteParam(m, base::checked_cast<uint32_t>(p.render_pass_list.size())); |
| 737 for (const auto& pass : p.render_pass_list) { | 736 for (const auto& pass : p.render_pass_list) { |
| 738 WriteParam(m, base::checked_cast<uint32_t>(pass->quad_list.size())); | 737 WriteParam(m, base::checked_cast<uint32_t>(pass->quad_list.size())); |
| 739 WriteParam( | 738 WriteParam( |
| 740 m, base::checked_cast<uint32_t>(pass->shared_quad_state_list.size())); | 739 m, base::checked_cast<uint32_t>(pass->shared_quad_state_list.size())); |
| 741 WriteParam(m, *pass); | 740 WriteParam(m, *pass); |
| 742 } | 741 } |
| 743 } | 742 } |
| 744 | 743 |
| 745 bool ParamTraits<cc::DelegatedFrameData>::Read(const base::Pickle* m, | 744 bool ParamTraits<cc::DelegatedFrameData>::Read(const base::Pickle* m, |
| 746 base::PickleIterator* iter, | 745 base::PickleIterator* iter, |
| 747 param_type* p) { | 746 param_type* p) { |
| 748 const size_t kMaxRenderPasses = 10000; | 747 const size_t kMaxRenderPasses = 10000; |
| 749 const size_t kMaxSharedQuadStateListSize = 100000; | 748 const size_t kMaxSharedQuadStateListSize = 100000; |
| 750 const size_t kMaxQuadListSize = 1000000; | 749 const size_t kMaxQuadListSize = 1000000; |
| 751 | 750 |
| 752 if (!ReadParam(m, iter, &p->device_scale_factor)) | |
| 753 return false; | |
| 754 | |
| 755 std::set<cc::RenderPassId> pass_set; | 751 std::set<cc::RenderPassId> pass_set; |
| 756 | 752 |
| 757 uint32_t num_render_passes; | 753 uint32_t num_render_passes; |
| 758 if (!ReadParam(m, iter, &p->resource_list) || | 754 if (!ReadParam(m, iter, &p->resource_list) || |
| 759 !ReadParam(m, iter, &num_render_passes) || | 755 !ReadParam(m, iter, &num_render_passes) || |
| 760 num_render_passes > kMaxRenderPasses || num_render_passes == 0) | 756 num_render_passes > kMaxRenderPasses || num_render_passes == 0) |
| 761 return false; | 757 return false; |
| 762 for (uint32_t i = 0; i < num_render_passes; ++i) { | 758 for (uint32_t i = 0; i < num_render_passes; ++i) { |
| 763 uint32_t quad_list_size; | 759 uint32_t quad_list_size; |
| 764 uint32_t shared_quad_state_list_size; | 760 uint32_t shared_quad_state_list_size; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 784 } | 780 } |
| 785 pass_set.insert(render_pass->id); | 781 pass_set.insert(render_pass->id); |
| 786 p->render_pass_list.push_back(std::move(render_pass)); | 782 p->render_pass_list.push_back(std::move(render_pass)); |
| 787 } | 783 } |
| 788 return true; | 784 return true; |
| 789 } | 785 } |
| 790 | 786 |
| 791 void ParamTraits<cc::DelegatedFrameData>::Log(const param_type& p, | 787 void ParamTraits<cc::DelegatedFrameData>::Log(const param_type& p, |
| 792 std::string* l) { | 788 std::string* l) { |
| 793 l->append("DelegatedFrameData("); | 789 l->append("DelegatedFrameData("); |
| 794 LogParam(p.device_scale_factor, l); | |
| 795 LogParam(p.resource_list, l); | 790 LogParam(p.resource_list, l); |
| 796 l->append(", ["); | 791 l->append(", ["); |
| 797 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { | 792 for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |
| 798 if (i) | 793 if (i) |
| 799 l->append(", "); | 794 l->append(", "); |
| 800 LogParam(*p.render_pass_list[i], l); | 795 LogParam(*p.render_pass_list[i], l); |
| 801 } | 796 } |
| 802 l->append("])"); | 797 l->append("])"); |
| 803 } | 798 } |
| 804 | 799 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 949 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_ | 944 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_ |
| 950 #include "cc/ipc/cc_param_traits_macros.h" | 945 #include "cc/ipc/cc_param_traits_macros.h" |
| 951 } // namespace IPC | 946 } // namespace IPC |
| 952 | 947 |
| 953 // Generate param traits log methods. | 948 // Generate param traits log methods. |
| 954 #include "ipc/param_traits_log_macros.h" | 949 #include "ipc/param_traits_log_macros.h" |
| 955 namespace IPC { | 950 namespace IPC { |
| 956 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_ | 951 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_ |
| 957 #include "cc/ipc/cc_param_traits_macros.h" | 952 #include "cc/ipc/cc_param_traits_macros.h" |
| 958 } // namespace IPC | 953 } // namespace IPC |
| OLD | NEW |