[Presentation API] Mojo typemap for content::PresentationConnectionMessage

content/common/presentation/presentation_struct_traits.h

Index: content/common/presentation/presentation_struct_traits.h
diff --git a/content/common/presentation/presentation_struct_traits.h b/content/common/presentation/presentation_struct_traits.h
index 7bf19a97e336ca05aa382fc3eaa2e647df9fcc8f..1c1dadd523e97e957d97895813ef0c6e4de227e3 100644
--- a/content/common/presentation/presentation_struct_traits.h
+++ b/content/common/presentation/presentation_struct_traits.h
@@ -6,11 +6,14 @@
 #define CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_
 
 #include <string>
+#include <vector>
 
 #include "base/macros.h"
+#include "base/optional.h"
 #include "base/strings/string_util.h"
+#include "content/public/common/presentation_connection_message.h"
 #include "content/public/common/presentation_session.h"
-#include "mojo/common/common_custom_types_struct_traits.h"
+//#include "mojo/common/common_custom_types_struct_traits.h"

[dcheng, 2017/02/28 06:45:27]

Nit: remove commented out code

[mark a. foltz, 2017/02/28 18:35:21]

Done

 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "url/mojo/url.mojom.h"
 
@@ -151,22 +154,7 @@ struct StructTraits<blink::mojom::PresentationSessionInfoDataView,
   }
 
   static bool Read(blink::mojom::PresentationSessionInfoDataView data,
-                   content::PresentationSessionInfo* out) {
-    if (!data.ReadUrl(&(out->presentation_url)))
-      return false;
-
-    if (!data.ReadId(&(out->presentation_id)))
-      return false;
-
-    if (out->presentation_id.empty() ||
-        !base::IsStringASCII(out->presentation_id) ||
-        out->presentation_id.length() >
-            content::PresentationSessionInfo::kMaxIdLength) {
-      return false;
-    }
-
-    return true;
-  }
+                   content::PresentationSessionInfo* out);
 };
 
 template <>
@@ -182,19 +170,34 @@ struct StructTraits<blink::mojom::PresentationErrorDataView,
   }
 
   static bool Read(blink::mojom::PresentationErrorDataView data,
-                   content::PresentationError* out) {
-    if (!data.ReadErrorType(&(out->error_type)))
-      return false;
+                   content::PresentationError* out);
+};
 
-    if (!data.ReadMessage(&(out->message)))
-      return false;
+template <>
+struct UnionTraits<blink::mojom::PresentationConnectionMessageDataView,
+                   content::PresentationConnectionMessage> {
+  static blink::mojom::PresentationConnectionMessageDataView::Tag GetTag(
+      const content::PresentationConnectionMessage& message) {
+    return message.is_binary()
+               ? blink::mojom::PresentationConnectionMessageDataView::Tag::DATA
+               : blink::mojom::PresentationConnectionMessageDataView::Tag::
+                     MESSAGE;
+  }
 
-    if (!base::IsStringUTF8(out->message) ||
-        out->message.length() > content::PresentationError::kMaxMessageLength)
-      return false;
+  static const std::string& message(
+      const content::PresentationConnectionMessage& message) {
+    DCHECK(!message.is_binary());
+    return message.message.value();
+  }
 
-    return true;
+  static const std::vector<uint8_t>& data(
+      const content::PresentationConnectionMessage& message) {
+    DCHECK(message.is_binary());
+    return message.data.value();
   }
+
+  static bool Read(blink::mojom::PresentationConnectionMessageDataView data,
+                   content::PresentationConnectionMessage* out);
 };
 
 }  // namespace mojo