Separate gfx_ipc into skia-dependent and non-skia-dependent parts

ui/gfx/ipc/skia/gfx_skia_param_traits.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_MEDIA_MEDIA_PARAM_TRAITS_H_
-#define CONTENT_COMMON_MEDIA_MEDIA_PARAM_TRAITS_H_
+#ifndef UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_
+#define UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_
 
-#include "content/common/content_export.h"
-#include "ipc/ipc_message.h"
+#include <string>
+
+#include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_param_traits.h"
+#include "ui/gfx/ipc/skia/gfx_skia_ipc_export.h"
 
-namespace media {
-class AudioParameters;
-struct VideoCaptureFormat;
+class SkBitmap;
+
+namespace base {
+class Pickle;
+class PickleIterator;
+}
+
+namespace gfx {
+class Transform;
 }
 
 namespace IPC {
 
 template <>
-struct CONTENT_EXPORT ParamTraits<media::AudioParameters> {
-  typedef media::AudioParameters param_type;
+struct GFX_SKIA_IPC_EXPORT ParamTraits<SkBitmap> {
+  using param_type = SkBitmap;
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
                    param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct CONTENT_EXPORT ParamTraits<media::VideoCaptureFormat> {
-  typedef media::VideoCaptureFormat param_type;
+struct GFX_SKIA_IPC_EXPORT ParamTraits<gfx::Transform> {
+  typedef gfx::Transform param_type;

[Tom Sepez, 2016/03/31 16:01:34]

nit: use "using" while we're at it.

[Mark Dittmer, 2016/03/31 16:21:29]

Done.

   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
                    param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
-} // namespace IPC
+}  // namespace IPC
 
-#endif  // CONTENT_COMMON_MEDIA_MEDIA_PARAM_TRAITS_H_
+#endif  // UI_GFX_IPC_GFX_SKIA_PARAM_TRAITS_H_