Remove ParamTraits::GetSize since it's not used anymore.

The buffer now grows after r490340. BUG=742369, 761117 Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: If735bd46400b96aae9eff1a6cbd4748c73e6668b Reviewed-on: https://chromium-review.googlesource.com/648249 Commit-Queue: John Abd-El-Malek <jam@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: enne <enne@chromium.org> Cr-Commit-Position: refs/heads/master@{#499355}
marcosholgado · Sep 2, 2017 · f4cec55 · f4cec55
1 parent 0c0a2d0
commit f4cec55
Show file tree

Hide file tree

Showing 95 changed files with 14 additions and 1,598 deletions.
diff --git a/android_webview/common/android_webview_message_generator.cc b/android_webview/common/android_webview_message_generator.cc
@@ -14,12 +14,6 @@
 #include "ipc/struct_destructor_macros.h"
 #include "android_webview/common/android_webview_message_generator.h"
 
-// Generate param traits size methods.
-#include "ipc/param_traits_size_macros.h"
-namespace IPC {
-#include "android_webview/common/android_webview_message_generator.h"
-}  // namespace IPC
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {

diff --git a/cc/ipc/cc_param_traits.cc b/cc/ipc/cc_param_traits.cc
@@ -32,49 +32,6 @@
 
 namespace IPC {
 
-void ParamTraits<cc::FilterOperation>::GetSize(base::PickleSizer* s,
-                                               const param_type& p) {
-  GetParamSize(s, p.type());
-  switch (p.type()) {
-    case cc::FilterOperation::GRAYSCALE:
-    case cc::FilterOperation::SEPIA:
-    case cc::FilterOperation::SATURATE:
-    case cc::FilterOperation::HUE_ROTATE:
-    case cc::FilterOperation::INVERT:
-    case cc::FilterOperation::BRIGHTNESS:
-    case cc::FilterOperation::SATURATING_BRIGHTNESS:
-    case cc::FilterOperation::CONTRAST:
-    case cc::FilterOperation::OPACITY:
-      GetParamSize(s, p.amount());
-      break;
-    case cc::FilterOperation::BLUR:
-      GetParamSize(s, p.amount());
-      GetParamSize(s, p.blur_tile_mode());
-      break;
-    case cc::FilterOperation::DROP_SHADOW:
-      GetParamSize(s, p.drop_shadow_offset());
-      GetParamSize(s, p.amount());
-      GetParamSize(s, p.drop_shadow_color());
-      break;
-    case cc::FilterOperation::COLOR_MATRIX:
-      for (int i = 0; i < 20; ++i)
-        GetParamSize(s, p.matrix()[i]);
-      break;
-    case cc::FilterOperation::ZOOM:
-      GetParamSize(s, p.amount());
-      GetParamSize(s, p.zoom_inset());
-      break;
-    case cc::FilterOperation::REFERENCE:
-      GetParamSize(s, p.image_filter());
-      break;
-    case cc::FilterOperation::ALPHA_THRESHOLD:
-      GetParamSize(s, p.amount());
-      GetParamSize(s, p.outer_threshold());
-      GetParamSize(s, p.shape());
-      break;
-  }
-}
-
 void ParamTraits<cc::FilterOperation>::Write(base::Pickle* m,
                                              const param_type& p) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.ipc"),
@@ -272,14 +229,6 @@ void ParamTraits<cc::FilterOperation>::Log(const param_type& p,
   l->append(")");
 }
 
-void ParamTraits<cc::FilterOperations>::GetSize(base::PickleSizer* s,
-                                                const param_type& p) {
-  GetParamSize(s, base::checked_cast<uint32_t>(p.size()));
-  for (std::size_t i = 0; i < p.size(); ++i) {
-    GetParamSize(s, p.at(i));
-  }
-}
-
 void ParamTraits<cc::FilterOperations>::Write(base::Pickle* m,
                                               const param_type& p) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.ipc"),
@@ -319,17 +268,6 @@ void ParamTraits<cc::FilterOperations>::Log(const param_type& p,
   l->append(")");
 }
 
-void ParamTraits<sk_sp<SkImageFilter>>::GetSize(base::PickleSizer* s,
-                                                const param_type& p) {
-  SkImageFilter* filter = p.get();
-  if (filter) {
-    sk_sp<SkData> data(SkValidatingSerializeFlattenable(filter));
-    s->AddData(base::checked_cast<int>(data->size()));
-  } else {
-    s->AddData(0);
-  }
-}
-
 void ParamTraits<sk_sp<SkImageFilter>>::Write(base::Pickle* m,
                                               const param_type& p) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.ipc"),
@@ -461,10 +399,10 @@ static size_t ReserveSizeForRenderPassWrite(const cc::RenderPass& p) {
   // The largest quad type, verified by a unit test.
   to_reserve += p.quad_list.size() * cc::LargestDrawQuadSize();
 
-  base::PickleSizer sizer;
-  GetParamSize(&sizer, p.filters);
-  GetParamSize(&sizer, p.background_filters);
-  to_reserve += sizer.payload_size();
+  to_reserve +=
+      sizeof(uint32_t) + p.filters.size() * sizeof(cc::FilterOperation);
+  to_reserve += sizeof(uint32_t) +
+                p.background_filters.size() * sizeof(cc::FilterOperation);
 
   return to_reserve;
 }
@@ -671,12 +609,6 @@ void ParamTraits<cc::RenderPass>::Log(const param_type& p, std::string* l) {
   l->append("])");
 }
 
-void ParamTraits<viz::FrameSinkId>::GetSize(base::PickleSizer* s,
-                                            const param_type& p) {
-  GetParamSize(s, p.client_id());
-  GetParamSize(s, p.sink_id());
-}
-
 void ParamTraits<viz::FrameSinkId>::Write(base::Pickle* m,
                                           const param_type& p) {
   WriteParam(m, p.client_id());
@@ -706,12 +638,6 @@ void ParamTraits<viz::FrameSinkId>::Log(const param_type& p, std::string* l) {
   l->append(")");
 }
 
-void ParamTraits<viz::LocalSurfaceId>::GetSize(base::PickleSizer* s,
-                                               const param_type& p) {
-  GetParamSize(s, p.local_id());
-  GetParamSize(s, p.nonce());
-}
-
 void ParamTraits<viz::LocalSurfaceId>::Write(base::Pickle* m,
                                              const param_type& p) {
   WriteParam(m, p.local_id());
@@ -742,12 +668,6 @@ void ParamTraits<viz::LocalSurfaceId>::Log(const param_type& p,
   l->append(")");
 }
 
-void ParamTraits<viz::SurfaceId>::GetSize(base::PickleSizer* s,
-                                          const param_type& p) {
-  GetParamSize(s, p.frame_sink_id());
-  GetParamSize(s, p.local_surface_id());
-}
-
 void ParamTraits<viz::SurfaceId>::Write(base::Pickle* m, const param_type& p) {
   WriteParam(m, p.frame_sink_id());
   WriteParam(m, p.local_surface_id());
@@ -776,13 +696,6 @@ void ParamTraits<viz::SurfaceId>::Log(const param_type& p, std::string* l) {
   l->append(")");
 }
 
-void ParamTraits<viz::SurfaceInfo>::GetSize(base::PickleSizer* s,
-                                            const param_type& p) {
-  GetParamSize(s, p.id());
-  GetParamSize(s, p.device_scale_factor());
-  GetParamSize(s, p.size_in_pixels());
-}
-
 void ParamTraits<viz::SurfaceInfo>::Write(base::Pickle* m,
                                           const param_type& p) {
   WriteParam(m, p.id());
@@ -906,13 +819,6 @@ void ParamTraits<cc::CompositorFrame>::Log(const param_type& p,
   l->append("])");
 }
 
-void ParamTraits<cc::DrawQuad::Resources>::GetSize(base::PickleSizer* s,
-                                                   const param_type& p) {
-  GetParamSize(s, p.count);
-  for (size_t i = 0; i < p.count; ++i)
-    GetParamSize(s, p.ids[i]);
-}
-
 void ParamTraits<cc::DrawQuad::Resources>::Write(base::Pickle* m,
                                                  const param_type& p) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.ipc"),
@@ -957,20 +863,6 @@ void ParamTraits<cc::DrawQuad::Resources>::Log(const param_type& p,
   l->append("])");
 }
 
-void ParamTraits<cc::YUVVideoDrawQuad>::GetSize(base::PickleSizer* s,
-                                                const param_type& p) {
-  ParamTraits<cc::DrawQuad>::GetSize(s, p);
-  GetParamSize(s, p.ya_tex_coord_rect);
-  GetParamSize(s, p.uv_tex_coord_rect);
-  GetParamSize(s, p.ya_tex_size);
-  GetParamSize(s, p.uv_tex_size);
-  GetParamSize(s, p.color_space);
-  GetParamSize(s, p.video_color_space);
-  GetParamSize(s, p.resource_offset);
-  GetParamSize(s, p.resource_multiplier);
-  GetParamSize(s, p.bits_per_channel);
-}
-
 void ParamTraits<cc::YUVVideoDrawQuad>::Write(base::Pickle* m,
                                               const param_type& p) {
   ParamTraits<cc::DrawQuad>::Write(m, p);
@@ -1027,12 +919,6 @@ void ParamTraits<cc::YUVVideoDrawQuad>::Log(const param_type& p,
   l->append("])");
 }
 
-void ParamTraits<viz::BeginFrameAck>::GetSize(base::PickleSizer* s,
-                                              const param_type& p) {
-  GetParamSize(s, p.sequence_number);
-  GetParamSize(s, p.source_id);
-}
-
 void ParamTraits<viz::BeginFrameAck>::Write(base::Pickle* m,
                                             const param_type& p) {
   m->WriteUInt64(p.sequence_number);
@@ -1058,13 +944,6 @@ void ParamTraits<viz::BeginFrameAck>::Log(const param_type& p, std::string* l) {
 
 }  // namespace IPC
 
-// Generate param traits size methods.
-#include "ipc/param_traits_size_macros.h"
-namespace IPC {
-#undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
-#include "cc/ipc/cc_param_traits_macros.h"
-}
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {

diff --git a/cc/ipc/cc_param_traits.h b/cc/ipc/cc_param_traits.h
@@ -26,7 +26,6 @@ namespace IPC {
 template <>
 struct ParamTraits<cc::FilterOperation> {
   typedef cc::FilterOperation param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -37,7 +36,6 @@ struct ParamTraits<cc::FilterOperation> {
 template <>
 struct ParamTraits<cc::FilterOperations> {
   typedef cc::FilterOperations param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -48,7 +46,6 @@ struct ParamTraits<cc::FilterOperations> {
 template <>
 struct ParamTraits<sk_sp<SkImageFilter>> {
   typedef sk_sp<SkImageFilter> param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -69,7 +66,6 @@ struct CC_IPC_EXPORT ParamTraits<cc::RenderPass> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<viz::FrameSinkId> {
   typedef viz::FrameSinkId param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -80,7 +76,6 @@ struct CC_IPC_EXPORT ParamTraits<viz::FrameSinkId> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<viz::LocalSurfaceId> {
   typedef viz::LocalSurfaceId param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -91,7 +86,6 @@ struct CC_IPC_EXPORT ParamTraits<viz::LocalSurfaceId> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<viz::SurfaceId> {
   typedef viz::SurfaceId param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -102,7 +96,6 @@ struct CC_IPC_EXPORT ParamTraits<viz::SurfaceId> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<viz::SurfaceInfo> {
   typedef viz::SurfaceInfo param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -123,7 +116,6 @@ struct CC_IPC_EXPORT ParamTraits<cc::CompositorFrame> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<cc::DrawQuad::Resources> {
   typedef cc::DrawQuad::Resources param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -134,7 +126,6 @@ struct CC_IPC_EXPORT ParamTraits<cc::DrawQuad::Resources> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<cc::YUVVideoDrawQuad> {
   typedef cc::YUVVideoDrawQuad param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -145,7 +136,6 @@ struct CC_IPC_EXPORT ParamTraits<cc::YUVVideoDrawQuad> {
 template <>
 struct CC_IPC_EXPORT ParamTraits<viz::BeginFrameAck> {
   typedef viz::BeginFrameAck param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,

diff --git a/chrome/common/OWNERS b/chrome/common/OWNERS
@@ -17,6 +17,9 @@ per-file nacl_loader.sb=rsesek@chromium.org
 
 per-file *_messages*.h=set noparent
 per-file *_messages*.h=file://ipc/SECURITY_OWNERS
+
+per-file *_messages.cc=set noparent
+per-file *_messages.cc=file://ipc/SECURITY_OWNERS
 
 per-file *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS

diff --git a/chrome/common/cast_messages.cc b/chrome/common/cast_messages.cc
@@ -6,11 +6,6 @@
 
 namespace IPC {
 
-void ParamTraits<media::cast::RtpTimeTicks>::GetSize(base::PickleSizer* s,
-                                                     const param_type& p) {
-  ParamTraits<uint64_t>::GetSize(s, p.SerializeForIPC());
-}
-
 void ParamTraits<media::cast::RtpTimeTicks>::Write(base::Pickle* m,
                                                    const param_type& p) {
   ParamTraits<uint64_t>::Write(m, p.SerializeForIPC());
@@ -34,11 +29,6 @@ void ParamTraits<media::cast::RtpTimeTicks>::Log(const param_type& p,
   l->append(oss.str());
 }
 
-void ParamTraits<media::cast::FrameId>::GetSize(base::PickleSizer* s,
-                                                const param_type& p) {
-  ParamTraits<uint64_t>::GetSize(s, p.SerializeForIPC());
-}
-
 void ParamTraits<media::cast::FrameId>::Write(base::Pickle* m,
                                               const param_type& p) {
   ParamTraits<uint64_t>::Write(m, p.SerializeForIPC());

diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h
@@ -21,7 +21,6 @@ namespace IPC {
 template<>
 struct ParamTraits<media::cast::RtpTimeTicks> {
   using param_type = media::cast::RtpTimeTicks;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -32,7 +31,6 @@ struct ParamTraits<media::cast::RtpTimeTicks> {
 template<>
 struct ParamTraits<media::cast::FrameId> {
   using param_type = media::cast::FrameId;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,

diff --git a/chrome/common/common_message_generator.cc b/chrome/common/common_message_generator.cc
@@ -16,13 +16,6 @@
 #include "chrome/common/safe_browsing/ipc_protobuf_message_null_macros.h"
 #include "chrome/common/common_message_generator.h"
 
-// Generate param traits size methods.
-#include "ipc/param_traits_size_macros.h"
-#include "chrome/common/safe_browsing/protobuf_message_size_macros.h"
-namespace IPC {
-#include "chrome/common/common_message_generator.h"
-}  // namespace IPC
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 #include "chrome/common/safe_browsing/protobuf_message_write_macros.h"

diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
@@ -5,13 +5,6 @@
 // Get basic type definitions.
 #include "chrome/common/common_param_traits.h"
 
-// Generate param traits size methods.
-#include "ipc/param_traits_size_macros.h"
-namespace IPC {
-#undef CHROME_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
-#include "chrome/common/common_param_traits_macros.h"
-}
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {

diff --git a/chrome/common/importer/profile_import_process_param_traits.cc b/chrome/common/importer/profile_import_process_param_traits.cc
@@ -16,13 +16,6 @@
 #undef CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_
 #include "chrome/common/importer/profile_import_process_param_traits_macros.h"
 
-// Generate param traits size methods.
-#include "ipc/param_traits_size_macros.h"
-namespace IPC {
-#undef CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_PARAM_TRAITS_MACROS_H_
-#include "chrome/common/importer/profile_import_process_param_traits_macros.h"
-}
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {