Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: Source/modules/websockets/WebSocket.cpp

Issue 330253002: WebSocket should stop resuming when suspended. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 } 89 }
90 90
91 bool WebSocket::EventQueue::isEmpty() const 91 bool WebSocket::EventQueue::isEmpty() const
92 { 92 {
93 return m_events.isEmpty(); 93 return m_events.isEmpty();
94 } 94 }
95 95
96 void WebSocket::EventQueue::suspend() 96 void WebSocket::EventQueue::suspend()
97 { 97 {
98 m_resumeTimer.stop();
98 if (m_state != Active) 99 if (m_state != Active)
99 return; 100 return;
100 101
101 m_state = Suspended; 102 m_state = Suspended;
102 } 103 }
103 104
104 void WebSocket::EventQueue::resume() 105 void WebSocket::EventQueue::resume()
105 { 106 {
106 if (m_state != Suspended || m_resumeTimer.isActive()) 107 if (m_state != Suspended || m_resumeTimer.isActive())
107 return; 108 return;
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 } 682 }
682 683
683 void WebSocket::trace(Visitor* visitor) 684 void WebSocket::trace(Visitor* visitor)
684 { 685 {
685 visitor->trace(m_channel); 686 visitor->trace(m_channel);
686 visitor->trace(m_eventQueue); 687 visitor->trace(m_eventQueue);
687 EventTargetWithInlineData::trace(visitor); 688 EventTargetWithInlineData::trace(visitor);
688 } 689 }
689 690
690 } // namespace WebCore 691 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698