diff options
author | sammc <sammc@chromium.org> | 2014-10-03 19:20:30 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 02:20:53 +0000 |
commit | 3c853bb5b1cbe849fa87539a13402ccaa4caae95 (patch) | |
tree | 4ca9ab6edaee761226ee93e5fef6964541813f42 /device | |
parent | 2edccc132ff8b341400d920c943d7c853af228cc (diff) | |
download | chromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.zip chromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.tar.gz chromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.tar.bz2 |
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}
Diffstat (limited to 'device')
-rw-r--r-- | device/serial/BUILD.gn | 1 | ||||
-rw-r--r-- | device/serial/serial.gyp | 3 | ||||
-rw-r--r-- | device/serial/serial_serialization.mojom | 31 |
3 files changed, 0 insertions, 35 deletions
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; -}; - -} |