Changeset 95026 in webkit
- Timestamp:
- Sep 13, 2011 8:20:04 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r95025 r95026 1 2011-09-13 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r95025. 4 http://trac.webkit.org/changeset/95025 5 https://bugs.webkit.org/show_bug.cgi?id=68005 6 7 Test failed on Snow Leopard bots. (Requested by yutak_home on 8 #webkit). 9 10 * websockets/ThreadableWebSocketChannelClientWrapper.cpp: 11 (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper): 12 (WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol): 13 (WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol): 14 * websockets/ThreadableWebSocketChannelClientWrapper.h: 15 1 16 2011-09-13 Yuta Kitamura <yutak@chromium.org> 2 17 -
trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp
r95025 r95026 45 45 , m_syncMethodDone(false) 46 46 , m_useHixie76Protocol(true) 47 , m_subprotocol("") 47 48 , m_sendRequestResult(false) 48 49 , m_bufferedAmount(0) … … 83 84 String ThreadableWebSocketChannelClientWrapper::subprotocol() const 84 85 { 85 return String(m_subprotocol);86 return m_subprotocol; 86 87 } 87 88 88 89 void ThreadableWebSocketChannelClientWrapper::setSubprotocol(const String& subprotocol) 89 90 { 90 unsigned length = subprotocol.length(); 91 m_subprotocol.resize(length); 92 if (length) 93 memcpy(m_subprotocol.data(), subprotocol.characters(), sizeof(UChar) * length); 91 m_subprotocol = subprotocol; 94 92 } 95 93 -
trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h
r95025 r95026 94 94 bool m_syncMethodDone; 95 95 bool m_useHixie76Protocol; 96 Vector<UChar>m_subprotocol;96 String m_subprotocol; 97 97 bool m_sendRequestResult; 98 98 unsigned long m_bufferedAmount;
Note: See TracChangeset
for help on using the changeset viewer.