OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/common/render_messages.h" | 5 #include "chrome/common/render_messages.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/common/edit_command.h" | 8 #include "chrome/common/edit_command.h" |
9 #include "chrome/common/extensions/extension_extent.h" | 9 #include "chrome/common/extensions/extension_extent.h" |
10 #include "chrome/common/extensions/url_pattern.h" | 10 #include "chrome/common/extensions/url_pattern.h" |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 void ParamTraits<webkit_glue::WebAccessibility>::Write(Message* m, | 786 void ParamTraits<webkit_glue::WebAccessibility>::Write(Message* m, |
787 const param_type& p) { | 787 const param_type& p) { |
788 WriteParam(m, p.id); | 788 WriteParam(m, p.id); |
789 WriteParam(m, p.name); | 789 WriteParam(m, p.name); |
790 WriteParam(m, p.value); | 790 WriteParam(m, p.value); |
791 WriteParam(m, static_cast<int>(p.role)); | 791 WriteParam(m, static_cast<int>(p.role)); |
792 WriteParam(m, static_cast<int>(p.state)); | 792 WriteParam(m, static_cast<int>(p.state)); |
793 WriteParam(m, p.location); | 793 WriteParam(m, p.location); |
794 WriteParam(m, p.attributes); | 794 WriteParam(m, p.attributes); |
795 WriteParam(m, p.children); | 795 WriteParam(m, p.children); |
| 796 WriteParam(m, p.html_attributes); |
796 } | 797 } |
797 | 798 |
798 bool ParamTraits<webkit_glue::WebAccessibility>::Read( | 799 bool ParamTraits<webkit_glue::WebAccessibility>::Read( |
799 const Message* m, void** iter, param_type* p) { | 800 const Message* m, void** iter, param_type* p) { |
800 bool ret = ReadParam(m, iter, &p->id); | 801 bool ret = ReadParam(m, iter, &p->id); |
801 ret = ret && ReadParam(m, iter, &p->name); | 802 ret = ret && ReadParam(m, iter, &p->name); |
802 ret = ret && ReadParam(m, iter, &p->value); | 803 ret = ret && ReadParam(m, iter, &p->value); |
803 int role = -1; | 804 int role = -1; |
804 ret = ret && ReadParam(m, iter, &role); | 805 ret = ret && ReadParam(m, iter, &role); |
805 if (role >= webkit_glue::WebAccessibility::ROLE_NONE && | 806 if (role >= webkit_glue::WebAccessibility::ROLE_NONE && |
806 role < webkit_glue::WebAccessibility::NUM_ROLES) { | 807 role < webkit_glue::WebAccessibility::NUM_ROLES) { |
807 p->role = static_cast<webkit_glue::WebAccessibility::Role>(role); | 808 p->role = static_cast<webkit_glue::WebAccessibility::Role>(role); |
808 } else { | 809 } else { |
809 p->role = webkit_glue::WebAccessibility::ROLE_NONE; | 810 p->role = webkit_glue::WebAccessibility::ROLE_NONE; |
810 } | 811 } |
811 int state = 0; | 812 int state = 0; |
812 ret = ret && ReadParam(m, iter, &state); | 813 ret = ret && ReadParam(m, iter, &state); |
813 p->state = static_cast<webkit_glue::WebAccessibility::State>(state); | 814 p->state = static_cast<webkit_glue::WebAccessibility::State>(state); |
814 ret = ret && ReadParam(m, iter, &p->location); | 815 ret = ret && ReadParam(m, iter, &p->location); |
815 ret = ret && ReadParam(m, iter, &p->attributes); | 816 ret = ret && ReadParam(m, iter, &p->attributes); |
816 ret = ret && ReadParam(m, iter, &p->children); | 817 ret = ret && ReadParam(m, iter, &p->children); |
| 818 ret = ret && ReadParam(m, iter, &p->html_attributes); |
817 return ret; | 819 return ret; |
818 } | 820 } |
819 | 821 |
820 void ParamTraits<webkit_glue::WebAccessibility>::Log(const param_type& p, | 822 void ParamTraits<webkit_glue::WebAccessibility>::Log(const param_type& p, |
821 std::string* l) { | 823 std::string* l) { |
822 l->append("("); | 824 l->append("("); |
823 LogParam(p.id, l); | 825 LogParam(p.id, l); |
824 l->append(", "); | 826 l->append(", "); |
825 LogParam(p.name, l); | 827 LogParam(p.name, l); |
826 l->append(", "); | 828 l->append(", "); |
827 LogParam(p.value, l); | 829 LogParam(p.value, l); |
828 l->append(", "); | 830 l->append(", "); |
829 LogParam(static_cast<int>(p.role), l); | 831 LogParam(static_cast<int>(p.role), l); |
830 l->append(", "); | 832 l->append(", "); |
831 LogParam(static_cast<int>(p.state), l); | 833 LogParam(static_cast<int>(p.state), l); |
832 l->append(", "); | 834 l->append(", "); |
833 LogParam(p.location, l); | 835 LogParam(p.location, l); |
834 l->append(", "); | 836 l->append(", "); |
835 LogParam(p.attributes, l); | 837 LogParam(p.attributes, l); |
836 l->append(", "); | 838 l->append(", "); |
837 LogParam(p.children, l); | 839 LogParam(p.children, l); |
| 840 l->append(", "); |
| 841 LogParam(p.html_attributes, l); |
838 l->append(")"); | 842 l->append(")"); |
839 } | 843 } |
840 | 844 |
841 } // namespace IPC | 845 } // namespace IPC |
OLD | NEW |