[Presentation API] Replaces type converters with typemaps

content/common/presentation/presentation_struct_traits.h

+// Copyright 2017 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_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_
+#define CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "content/public/common/presentation_session.h"
+#include "mojo/common/common_custom_types_struct_traits.h"
+#include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
+#include "url/mojo/url.mojom.h"
+
+namespace mojo {
+
+template <>
+struct EnumTraits<blink::mojom::PresentationErrorType,
+                  content::PresentationErrorType> {
+  static blink::mojom::PresentationErrorType ToMojom(
+      content::PresentationErrorType input) {
+    switch (input) {
+      case content::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS:
+        return blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS;
+      case content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED:
+        return blink::mojom::PresentationErrorType::SESSION_REQUEST_CANCELLED;
+      case content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND:
+        return blink::mojom::PresentationErrorType::NO_PRESENTATION_FOUND;
+      case content::PRESENTATION_ERROR_UNKNOWN:
+        return blink::mojom::PresentationErrorType::UNKNOWN;
+    }
+    NOTREACHED() << "Unknown content::PresentationErrorType "
+                 << static_cast<int>(input);
+    return blink::mojom::PresentationErrorType::UNKNOWN;
+  }
+
+  static bool FromMojom(blink::mojom::PresentationErrorType input,
+                        content::PresentationErrorType* output) {
+    switch (input) {
+      case blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS:
+        *output = content::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS;
+        return true;
+      case blink::mojom::PresentationErrorType::SESSION_REQUEST_CANCELLED:
+        *output = content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED;
+        return true;
+      case blink::mojom::PresentationErrorType::NO_PRESENTATION_FOUND:
+        *output = content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND;
+        return true;
+      case blink::mojom::PresentationErrorType::UNKNOWN:
+        *output = content::PRESENTATION_ERROR_UNKNOWN;
+        return true;
+    }
+    return false;
+  }
+};
+
+template <>
+struct EnumTraits<blink::mojom::PresentationConnectionState,
+                  content::PresentationConnectionState> {
+  static blink::mojom::PresentationConnectionState ToMojom(
+      content::PresentationConnectionState input) {
+    switch (input) {
+      case content::PRESENTATION_CONNECTION_STATE_CONNECTING:
+        return blink::mojom::PresentationConnectionState::CONNECTING;
+      case content::PRESENTATION_CONNECTION_STATE_CONNECTED:
+        return blink::mojom::PresentationConnectionState::CONNECTED;
+      case content::PRESENTATION_CONNECTION_STATE_CLOSED:
+        return blink::mojom::PresentationConnectionState::CLOSED;
+      case content::PRESENTATION_CONNECTION_STATE_TERMINATED:
+        return blink::mojom::PresentationConnectionState::TERMINATED;
+    }
+    NOTREACHED() << "Unknown content::PresentationConnectionState "
+                 << static_cast<int>(input);
+    return blink::mojom::PresentationConnectionState::CONNECTING;

[nasko, 2017/01/25 17:58:16]

This is different than the code before, which returned
blink::mojom::PresentationConnectionState::TERMINATED. Is this intentional?

[mark a. foltz, 2017/01/27 22:41:08]

No, changed to TERMINATED to keep behavior consistent.

+  }
+
+  static bool FromMojom(blink::mojom::PresentationConnectionState input,
+                        content::PresentationConnectionState* output) {
+    switch (input) {
+      case blink::mojom::PresentationConnectionState::CONNECTING:
+        *output = content::PRESENTATION_CONNECTION_STATE_CONNECTING;
+        return true;
+      case blink::mojom::PresentationConnectionState::CONNECTED:
+        *output = content::PRESENTATION_CONNECTION_STATE_CONNECTED;
+        return true;
+      case blink::mojom::PresentationConnectionState::CLOSED:
+        *output = content::PRESENTATION_CONNECTION_STATE_CLOSED;
+        return true;
+      case blink::mojom::PresentationConnectionState::TERMINATED:
+        *output = content::PRESENTATION_CONNECTION_STATE_TERMINATED;
+        return true;
+    }
+    return false;
+  }
+};
+
+template <>
+struct EnumTraits<blink::mojom::PresentationConnectionCloseReason,
+                  content::PresentationConnectionCloseReason> {
+  static blink::mojom::PresentationConnectionCloseReason ToMojom(
+      content::PresentationConnectionCloseReason input) {
+    switch (input) {
+      case content::PRESENTATION_CONNECTION_CLOSE_REASON_CONNECTION_ERROR:
+        return blink::mojom::PresentationConnectionCloseReason::
+            CONNECTION_ERROR;
+      case content::PRESENTATION_CONNECTION_CLOSE_REASON_CLOSED:
+        return blink::mojom::PresentationConnectionCloseReason::CLOSED;
+      case content::PRESENTATION_CONNECTION_CLOSE_REASON_WENT_AWAY:
+        return blink::mojom::PresentationConnectionCloseReason::WENT_AWAY;
+    }
+    NOTREACHED() << "Unknown content::PresentationConnectionCloseReason "
+                 << static_cast<int>(input);
+    return blink::mojom::PresentationConnectionCloseReason::CONNECTION_ERROR;
+  }
+
+  static bool FromMojom(blink::mojom::PresentationConnectionCloseReason input,
+                        content::PresentationConnectionCloseReason* output) {
+    switch (input) {
+      case blink::mojom::PresentationConnectionCloseReason::CONNECTION_ERROR:
+        *output =
+            content::PRESENTATION_CONNECTION_CLOSE_REASON_CONNECTION_ERROR;
+        return true;
+      case blink::mojom::PresentationConnectionCloseReason::CLOSED:
+        *output = content::PRESENTATION_CONNECTION_CLOSE_REASON_CLOSED;
+        return true;
+      case blink::mojom::PresentationConnectionCloseReason::WENT_AWAY:
+        *output = content::PRESENTATION_CONNECTION_CLOSE_REASON_WENT_AWAY;
+        return true;
+    }
+    return false;
+  }
+};
+
+// TODO(mfoltz): Add some validations?

[nasko, 2017/01/25 17:58:16]

Do we expect this to be resolved in this CL with subsequent patch or a different
CL?

[mark a. foltz, 2017/01/27 22:41:08]

Added validations for the error message and presentation_id fields.

+
+template <>
+struct StructTraits<blink::mojom::PresentationSessionInfoDataView,
+                    content::PresentationSessionInfo> {
+  static const GURL& url(const content::PresentationSessionInfo& session_info) {
+    return session_info.presentation_url;
+  }
+
+  static const std::string& id(
+      const content::PresentationSessionInfo& session_info) {
+    return session_info.presentation_id;
+  }
+
+  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;
+
+    return true;
+  }
+};
+
+template <>
+struct StructTraits<blink::mojom::PresentationErrorDataView,
+                    content::PresentationError> {
+  static content::PresentationErrorType error_type(
+      const content::PresentationError& error) {
+    return error.error_type;
+  }
+
+  static const std::string& message(const content::PresentationError& error) {
+    return error.message;
+  }
+
+  static bool Read(blink::mojom::PresentationErrorDataView data,
+                   content::PresentationError* out) {
+    if (!data.ReadErrorType(&(out->error_type)))
+      return false;
+
+    if (!data.ReadMessage(&(out->message)))
+      return false;
+
+    return true;
+  }
+};
+
+}  // namespace mojo
+
+#endif  // CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_