From 3c853bb5b1cbe849fa87539a13402ccaa4caae95 Mon Sep 17 00:00:00 2001 From: sammc Date: Fri, 3 Oct 2014 19:20:30 -0700 Subject: Revert of Add serialization support to the JS serial connection client. (patchset #5 id:180001 of https://codereview.chromium.org/592263004/) Reason for revert: Broke compile on GPU Mac Builder. Original issue's description: > Add serialization support to the JS serial connection client. > > To support persistent serial connections on mojo, serial.Connection and > its dependencies must be serializable to mojo structs so it can be > stashed. This adds serialization support to serial.Connection. > > BUG=389016 > > Committed: https://crrev.com/3daad1ed89cd32023624be98edaf051a0043ff5f > Cr-Commit-Position: refs/heads/master@{#298158} TBR=raymes@chromium.org,rockot@chromium.org NOTREECHECKS=true NOTRY=true BUG=389016 Review URL: https://codereview.chromium.org/627123002 Cr-Commit-Position: refs/heads/master@{#298161} --- device/serial/BUILD.gn | 1 - device/serial/serial.gyp | 3 --- device/serial/serial_serialization.mojom | 31 ------------------------------- 3 files changed, 35 deletions(-) delete mode 100644 device/serial/serial_serialization.mojom (limited to 'device') diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn index 5e0dff6..ccab385 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -77,6 +77,5 @@ mojom("serial_mojo") { "data_stream.mojom", "data_stream_serialization.mojom", "serial.mojom", - "serial_serialization.mojom", ] } diff --git a/device/serial/serial.gyp b/device/serial/serial.gyp index e9e47f2..1e0d05e 100644 --- a/device/serial/serial.gyp +++ b/device/serial/serial.gyp @@ -21,7 +21,6 @@ 'data_stream.mojom', 'data_stream_serialization.mojom', 'serial.mojom', - 'serial_serialization.mojom', ], }, { @@ -56,8 +55,6 @@ '<(SHARED_INTERMEDIATE_DIR)/device/serial/data_stream_serialization.mojom.h', '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial.mojom.cc', '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial.mojom.h', - '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial_serialization.mojom.cc', - '<(SHARED_INTERMEDIATE_DIR)/device/serial/serial_serialization.mojom.h', 'async_waiter.cc', 'async_waiter.h', 'buffer.cc', diff --git a/device/serial/serial_serialization.mojom b/device/serial/serial_serialization.mojom deleted file mode 100644 index 8ea495c..0000000 --- a/device/serial/serial_serialization.mojom +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2014 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. - -import "serial.mojom" -import "data_stream_serialization.mojom" - -module device.serial { - -// The client state of a serial connection. -struct ConnectionState { - uint32 connectionId; - bool paused = false; - bool persistent = false; - string name = ""; - uint32 receiveTimeout = 0; - uint32 sendTimeout = 0; - uint32 bufferSize = 4096; -}; - -// A serialized serial connection. -struct SerializedConnection { - ConnectionState state; - ReceiveError queuedReceiveError = NONE; - int8[]? queuedReceiveData; - Connection connection; - SerializedDataSender sender; - SerializedDataReceiver receiver; -}; - -} -- cgit v1.1