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

Side by Side Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp

Issue 2572603002: ABANDONED CL: Rename readyState() to getReadyState(). (Closed)
Patch Set: Created 4 years 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
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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 } 587 }
588 m_state = kClosing; 588 m_state = kClosing;
589 if (m_channel) 589 if (m_channel)
590 m_channel->close(code, cleansedReason); 590 m_channel->close(code, cleansedReason);
591 } 591 }
592 592
593 const KURL& DOMWebSocket::url() const { 593 const KURL& DOMWebSocket::url() const {
594 return m_url; 594 return m_url;
595 } 595 }
596 596
597 DOMWebSocket::State DOMWebSocket::readyState() const { 597 DOMWebSocket::State DOMWebSocket::getReadyState() const {
598 return m_state; 598 return m_state;
599 } 599 }
600 600
601 unsigned DOMWebSocket::bufferedAmount() const { 601 unsigned DOMWebSocket::bufferedAmount() const {
602 uint64_t sum = m_bufferedAmountAfterClose + m_bufferedAmount; 602 uint64_t sum = m_bufferedAmountAfterClose + m_bufferedAmount;
603 603
604 if (sum > std::numeric_limits<unsigned>::max()) 604 if (sum > std::numeric_limits<unsigned>::max())
605 return std::numeric_limits<unsigned>::max(); 605 return std::numeric_limits<unsigned>::max();
606 return sum; 606 return sum;
607 } 607 }
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 860
861 DEFINE_TRACE(DOMWebSocket) { 861 DEFINE_TRACE(DOMWebSocket) {
862 visitor->trace(m_channel); 862 visitor->trace(m_channel);
863 visitor->trace(m_eventQueue); 863 visitor->trace(m_eventQueue);
864 WebSocketChannelClient::trace(visitor); 864 WebSocketChannelClient::trace(visitor);
865 EventTargetWithInlineData::trace(visitor); 865 EventTargetWithInlineData::trace(visitor);
866 ActiveDOMObject::trace(visitor); 866 ActiveDOMObject::trace(visitor);
867 } 867 }
868 868
869 } // namespace blink 869 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698