Title: [95026] trunk/Source/WebCore
- Revision
- 95026
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-13 08:20:04 -0700 (Tue, 13 Sep 2011)
Log Message
Unreviewed, rolling out r95025.
http://trac.webkit.org/changeset/95025
https://bugs.webkit.org/show_bug.cgi?id=68005
Test failed on Snow Leopard bots. (Requested by yutak_home on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-09-13
* websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
(WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol):
(WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
* websockets/ThreadableWebSocketChannelClientWrapper.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95025 => 95026)
--- trunk/Source/WebCore/ChangeLog 2011-09-13 13:25:18 UTC (rev 95025)
+++ trunk/Source/WebCore/ChangeLog 2011-09-13 15:20:04 UTC (rev 95026)
@@ -1,3 +1,18 @@
+2011-09-13 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r95025.
+ http://trac.webkit.org/changeset/95025
+ https://bugs.webkit.org/show_bug.cgi?id=68005
+
+ Test failed on Snow Leopard bots. (Requested by yutak_home on
+ #webkit).
+
+ * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
+ * websockets/ThreadableWebSocketChannelClientWrapper.h:
+
2011-09-13 Yuta Kitamura <yu...@chromium.org>
ThreadableWebSocketChannelClientWrapper shouldn't have a String in it.
Modified: trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp (95025 => 95026)
--- trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2011-09-13 13:25:18 UTC (rev 95025)
+++ trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2011-09-13 15:20:04 UTC (rev 95026)
@@ -44,6 +44,7 @@
: m_client(client)
, m_syncMethodDone(false)
, m_useHixie76Protocol(true)
+ , m_subprotocol("")
, m_sendRequestResult(false)
, m_bufferedAmount(0)
, m_suspended(false)
@@ -82,15 +83,12 @@
String ThreadableWebSocketChannelClientWrapper::subprotocol() const
{
- return String(m_subprotocol);
+ return m_subprotocol;
}
void ThreadableWebSocketChannelClientWrapper::setSubprotocol(const String& subprotocol)
{
- unsigned length = subprotocol.length();
- m_subprotocol.resize(length);
- if (length)
- memcpy(m_subprotocol.data(), subprotocol.characters(), sizeof(UChar) * length);
+ m_subprotocol = subprotocol;
}
bool ThreadableWebSocketChannelClientWrapper::sendRequestResult() const
Modified: trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h (95025 => 95026)
--- trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h 2011-09-13 13:25:18 UTC (rev 95025)
+++ trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h 2011-09-13 15:20:04 UTC (rev 95026)
@@ -93,7 +93,7 @@
WebSocketChannelClient* m_client;
bool m_syncMethodDone;
bool m_useHixie76Protocol;
- Vector<UChar> m_subprotocol;
+ String m_subprotocol;
bool m_sendRequestResult;
unsigned long m_bufferedAmount;
bool m_suspended;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
