Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: base/bind_internal.h

Issue 15836004: Update base/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | base/bind_internal.h.pump » ('j') | base/bind_internal.h.pump » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // This file was GENERATED by command: 1 // This file was GENERATED by command:
2 // pump.py bind_internal.h.pump 2 // pump.py bind_internal.h.pump
3 // DO NOT EDIT BY HAND!!! 3 // DO NOT EDIT BY HAND!!!
4 4
5 5
6 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 6 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
7 // Use of this source code is governed by a BSD-style license that can be 7 // Use of this source code is governed by a BSD-style license that can be
8 // found in the LICENSE file. 8 // found in the LICENSE file.
9 9
10 #ifndef BASE_BIND_INTERNAL_H_ 10 #ifndef BASE_BIND_INTERNAL_H_
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 } 872 }
873 }; 873 };
874 874
875 template <typename Runnable, typename A1> 875 template <typename Runnable, typename A1>
876 struct InvokeHelper<true, void, Runnable, 876 struct InvokeHelper<true, void, Runnable,
877 void(A1)> { 877 void(A1)> {
878 static void MakeItSo(Runnable runnable, A1 a1) { 878 static void MakeItSo(Runnable runnable, A1 a1) {
879 if (!a1.get()) { 879 if (!a1.get()) {
880 return; 880 return;
881 } 881 }
882 882 runnable.Run(a1.get());
883 runnable.Run(CallbackForward(a1));
884 } 883 }
885 }; 884 };
886 885
887 template <typename ReturnType, typename Runnable,typename A1, typename A2> 886 template <typename ReturnType, typename Runnable,typename A1, typename A2>
888 struct InvokeHelper<false, ReturnType, Runnable, 887 struct InvokeHelper<false, ReturnType, Runnable,
889 void(A1, A2)> { 888 void(A1, A2)> {
890 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2) { 889 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2) {
891 return runnable.Run(CallbackForward(a1), CallbackForward(a2)); 890 return runnable.Run(CallbackForward(a1), CallbackForward(a2));
892 } 891 }
893 }; 892 };
894 893
895 template <typename Runnable,typename A1, typename A2> 894 template <typename Runnable,typename A1, typename A2>
896 struct InvokeHelper<false, void, Runnable, 895 struct InvokeHelper<false, void, Runnable,
897 void(A1, A2)> { 896 void(A1, A2)> {
898 static void MakeItSo(Runnable runnable, A1 a1, A2 a2) { 897 static void MakeItSo(Runnable runnable, A1 a1, A2 a2) {
899 runnable.Run(CallbackForward(a1), CallbackForward(a2)); 898 runnable.Run(CallbackForward(a1), CallbackForward(a2));
900 } 899 }
901 }; 900 };
902 901
903 template <typename Runnable, typename A1, typename A2> 902 template <typename Runnable, typename A1, typename A2>
904 struct InvokeHelper<true, void, Runnable, 903 struct InvokeHelper<true, void, Runnable,
905 void(A1, A2)> { 904 void(A1, A2)> {
906 static void MakeItSo(Runnable runnable, A1 a1, A2 a2) { 905 static void MakeItSo(Runnable runnable, A1 a1, A2 a2) {
907 if (!a1.get()) { 906 if (!a1.get()) {
908 return; 907 return;
909 } 908 }
910 909 runnable.Run(a1.get(), CallbackForward(a2));
911 runnable.Run(CallbackForward(a1), CallbackForward(a2));
912 } 910 }
913 }; 911 };
914 912
915 template <typename ReturnType, typename Runnable,typename A1, typename A2, 913 template <typename ReturnType, typename Runnable,typename A1, typename A2,
916 typename A3> 914 typename A3>
917 struct InvokeHelper<false, ReturnType, Runnable, 915 struct InvokeHelper<false, ReturnType, Runnable,
918 void(A1, A2, A3)> { 916 void(A1, A2, A3)> {
919 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) { 917 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
920 return runnable.Run(CallbackForward(a1), CallbackForward(a2), 918 return runnable.Run(CallbackForward(a1), CallbackForward(a2),
921 CallbackForward(a3)); 919 CallbackForward(a3));
922 } 920 }
923 }; 921 };
924 922
925 template <typename Runnable,typename A1, typename A2, typename A3> 923 template <typename Runnable,typename A1, typename A2, typename A3>
926 struct InvokeHelper<false, void, Runnable, 924 struct InvokeHelper<false, void, Runnable,
927 void(A1, A2, A3)> { 925 void(A1, A2, A3)> {
928 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) { 926 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
929 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3)); 927 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
930 } 928 }
931 }; 929 };
932 930
933 template <typename Runnable, typename A1, typename A2, typename A3> 931 template <typename Runnable, typename A1, typename A2, typename A3>
934 struct InvokeHelper<true, void, Runnable, 932 struct InvokeHelper<true, void, Runnable,
935 void(A1, A2, A3)> { 933 void(A1, A2, A3)> {
936 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) { 934 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
937 if (!a1.get()) { 935 if (!a1.get()) {
938 return; 936 return;
939 } 937 }
940 938 runnable.Run(a1.get(), CallbackForward(a2), CallbackForward(a3));
941 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
942 } 939 }
943 }; 940 };
944 941
945 template <typename ReturnType, typename Runnable,typename A1, typename A2, 942 template <typename ReturnType, typename Runnable,typename A1, typename A2,
946 typename A3, typename A4> 943 typename A3, typename A4>
947 struct InvokeHelper<false, ReturnType, Runnable, 944 struct InvokeHelper<false, ReturnType, Runnable,
948 void(A1, A2, A3, A4)> { 945 void(A1, A2, A3, A4)> {
949 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) { 946 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
950 return runnable.Run(CallbackForward(a1), CallbackForward(a2), 947 return runnable.Run(CallbackForward(a1), CallbackForward(a2),
951 CallbackForward(a3), CallbackForward(a4)); 948 CallbackForward(a3), CallbackForward(a4));
952 } 949 }
953 }; 950 };
954 951
955 template <typename Runnable,typename A1, typename A2, typename A3, typename A4> 952 template <typename Runnable,typename A1, typename A2, typename A3, typename A4>
956 struct InvokeHelper<false, void, Runnable, 953 struct InvokeHelper<false, void, Runnable,
957 void(A1, A2, A3, A4)> { 954 void(A1, A2, A3, A4)> {
958 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) { 955 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
959 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3), 956 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
960 CallbackForward(a4)); 957 CallbackForward(a4));
961 } 958 }
962 }; 959 };
963 960
964 template <typename Runnable, typename A1, typename A2, typename A3, typename A4> 961 template <typename Runnable, typename A1, typename A2, typename A3, typename A4>
965 struct InvokeHelper<true, void, Runnable, 962 struct InvokeHelper<true, void, Runnable,
966 void(A1, A2, A3, A4)> { 963 void(A1, A2, A3, A4)> {
967 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) { 964 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
968 if (!a1.get()) { 965 if (!a1.get()) {
969 return; 966 return;
970 } 967 }
971 968 runnable.Run(a1.get(), CallbackForward(a2), CallbackForward(a3),
972 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
973 CallbackForward(a4)); 969 CallbackForward(a4));
974 } 970 }
975 }; 971 };
976 972
977 template <typename ReturnType, typename Runnable,typename A1, typename A2, 973 template <typename ReturnType, typename Runnable,typename A1, typename A2,
978 typename A3, typename A4, typename A5> 974 typename A3, typename A4, typename A5>
979 struct InvokeHelper<false, ReturnType, Runnable, 975 struct InvokeHelper<false, ReturnType, Runnable,
980 void(A1, A2, A3, A4, A5)> { 976 void(A1, A2, A3, A4, A5)> {
981 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, 977 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
982 A5 a5) { 978 A5 a5) {
(...skipping 13 matching lines...) Expand all
996 }; 992 };
997 993
998 template <typename Runnable, typename A1, typename A2, typename A3, 994 template <typename Runnable, typename A1, typename A2, typename A3,
999 typename A4, typename A5> 995 typename A4, typename A5>
1000 struct InvokeHelper<true, void, Runnable, 996 struct InvokeHelper<true, void, Runnable,
1001 void(A1, A2, A3, A4, A5)> { 997 void(A1, A2, A3, A4, A5)> {
1002 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) { 998 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
1003 if (!a1.get()) { 999 if (!a1.get()) {
1004 return; 1000 return;
1005 } 1001 }
1006 1002 runnable.Run(a1.get(), CallbackForward(a2), CallbackForward(a3),
1007 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
1008 CallbackForward(a4), CallbackForward(a5)); 1003 CallbackForward(a4), CallbackForward(a5));
1009 } 1004 }
1010 }; 1005 };
1011 1006
1012 template <typename ReturnType, typename Runnable,typename A1, typename A2, 1007 template <typename ReturnType, typename Runnable,typename A1, typename A2,
1013 typename A3, typename A4, typename A5, typename A6> 1008 typename A3, typename A4, typename A5, typename A6>
1014 struct InvokeHelper<false, ReturnType, Runnable, 1009 struct InvokeHelper<false, ReturnType, Runnable,
1015 void(A1, A2, A3, A4, A5, A6)> { 1010 void(A1, A2, A3, A4, A5, A6)> {
1016 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, 1011 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
1017 A5 a5, A6 a6) { 1012 A5 a5, A6 a6) {
(...skipping 16 matching lines...) Expand all
1034 1029
1035 template <typename Runnable, typename A1, typename A2, typename A3, 1030 template <typename Runnable, typename A1, typename A2, typename A3,
1036 typename A4, typename A5, typename A6> 1031 typename A4, typename A5, typename A6>
1037 struct InvokeHelper<true, void, Runnable, 1032 struct InvokeHelper<true, void, Runnable,
1038 void(A1, A2, A3, A4, A5, A6)> { 1033 void(A1, A2, A3, A4, A5, A6)> {
1039 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, 1034 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
1040 A6 a6) { 1035 A6 a6) {
1041 if (!a1.get()) { 1036 if (!a1.get()) {
1042 return; 1037 return;
1043 } 1038 }
1044 1039 runnable.Run(a1.get(), CallbackForward(a2), CallbackForward(a3),
1045 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
1046 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6)); 1040 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
1047 } 1041 }
1048 }; 1042 };
1049 1043
1050 template <typename ReturnType, typename Runnable,typename A1, typename A2, 1044 template <typename ReturnType, typename Runnable,typename A1, typename A2,
1051 typename A3, typename A4, typename A5, typename A6, typename A7> 1045 typename A3, typename A4, typename A5, typename A6, typename A7>
1052 struct InvokeHelper<false, ReturnType, Runnable, 1046 struct InvokeHelper<false, ReturnType, Runnable,
1053 void(A1, A2, A3, A4, A5, A6, A7)> { 1047 void(A1, A2, A3, A4, A5, A6, A7)> {
1054 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, 1048 static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
1055 A5 a5, A6 a6, A7 a7) { 1049 A5 a5, A6 a6, A7 a7) {
(...skipping 17 matching lines...) Expand all
1073 1067
1074 template <typename Runnable, typename A1, typename A2, typename A3, 1068 template <typename Runnable, typename A1, typename A2, typename A3,
1075 typename A4, typename A5, typename A6, typename A7> 1069 typename A4, typename A5, typename A6, typename A7>
1076 struct InvokeHelper<true, void, Runnable, 1070 struct InvokeHelper<true, void, Runnable,
1077 void(A1, A2, A3, A4, A5, A6, A7)> { 1071 void(A1, A2, A3, A4, A5, A6, A7)> {
1078 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, 1072 static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
1079 A6 a6, A7 a7) { 1073 A6 a6, A7 a7) {
1080 if (!a1.get()) { 1074 if (!a1.get()) {
1081 return; 1075 return;
1082 } 1076 }
1083 1077 runnable.Run(a1.get(), CallbackForward(a2), CallbackForward(a3),
1084 runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
1085 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6), 1078 CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
1086 CallbackForward(a7)); 1079 CallbackForward(a7));
1087 } 1080 }
1088 }; 1081 };
1089 1082
1090 #if !defined(_MSC_VER) 1083 #if !defined(_MSC_VER)
1091 1084
1092 template <typename ReturnType, typename Runnable, typename ArgsType> 1085 template <typename ReturnType, typename Runnable, typename ArgsType>
1093 struct InvokeHelper<true, ReturnType, Runnable, ArgsType> { 1086 struct InvokeHelper<true, ReturnType, Runnable, ArgsType> {
1094 // WeakCalls are only supported for functions with a void return type. 1087 // WeakCalls are only supported for functions with a void return type.
(...skipping 1689 matching lines...) Expand 10 before | Expand all | Expand 10 after
2784 P4 p4_; 2777 P4 p4_;
2785 P5 p5_; 2778 P5 p5_;
2786 P6 p6_; 2779 P6 p6_;
2787 P7 p7_; 2780 P7 p7_;
2788 }; 2781 };
2789 2782
2790 } // namespace internal 2783 } // namespace internal
2791 } // namespace base 2784 } // namespace base
2792 2785
2793 #endif // BASE_BIND_INTERNAL_H_ 2786 #endif // BASE_BIND_INTERNAL_H_
OLDNEW
« no previous file with comments | « no previous file | base/bind_internal.h.pump » ('j') | base/bind_internal.h.pump » ('J')

Powered by Google App Engine
This is Rietveld 408576698