diff options
author | Nikki <nikkicubed@gmail.com> | 2015-12-29 13:30:35 -0700 |
---|---|---|
committer | Nikki <nikkicubed@gmail.com> | 2015-12-29 13:30:35 -0700 |
commit | 20edf213525e78e4f23337b3aad4f5113249947e (patch) | |
tree | 6d0070f977ea96d8eb7542960c491db2831f6c2f /components/script/dom/websocket.rs | |
parent | b26cd498c6ad2409459c36a71cf1df47e112a8bb (diff) | |
download | servo-20edf213525e78e4f23337b3aad4f5113249947e.tar.gz servo-20edf213525e78e4f23337b3aad4f5113249947e.zip |
updated websocket buffered_amount to be u64 instead of u32
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 8f008255993..4199ff7094e 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -138,7 +138,7 @@ pub struct WebSocket { url: Url, global: GlobalField, ready_state: Cell<WebSocketRequestState>, - buffered_amount: Cell<u32>, + buffered_amount: Cell<u64>, clearing_buffer: Cell<bool>, //Flag to tell if there is a running task to clear buffered_amount #[ignore_heap_size_of = "Defined in std"] sender: DOMRefCell<Option<IpcSender<WebSocketDomAction>>>, @@ -299,17 +299,7 @@ impl WebSocket { let chan = global.r().networking_task_source(); let address = Trusted::new(self, chan.clone()); - let new_buffer_amount = (self.buffered_amount.get() as u64) + data_byte_len; - if new_buffer_amount > (u32::max_value() as u64) { - self.buffered_amount.set(u32::max_value()); - self.full.set(true); - - let _ = self.Close(None, None); - return Ok(false); - - } - - self.buffered_amount.set(new_buffer_amount as u32); + self.buffered_amount.set(self.buffered_amount.get() + data_byte_len); if return_after_buffer { return Ok(false); @@ -353,7 +343,7 @@ impl WebSocketMethods for WebSocket { } // https://html.spec.whatwg.org/multipage/#dom-websocket-bufferedamount - fn BufferedAmount(&self) -> u32 { + fn BufferedAmount(&self) -> u64 { self.buffered_amount.get() } |