Changeset 95026 in webkit


Ignore:
Timestamp:
Sep 13, 2011 8:20:04 AM (13 years ago)
Author:
commit-queue@webkit.org
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.bot@gmail.com> on 2011-09-13

  • websockets/ThreadableWebSocketChannelClientWrapper.cpp:

(WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
(WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol):
(WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):

  • websockets/ThreadableWebSocketChannelClientWrapper.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r95025 r95026  
     12011-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
    1162011-09-13  Yuta Kitamura  <yutak@chromium.org>
    217
  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp

    r95025 r95026  
    4545    , m_syncMethodDone(false)
    4646    , m_useHixie76Protocol(true)
     47    , m_subprotocol("")
    4748    , m_sendRequestResult(false)
    4849    , m_bufferedAmount(0)
     
    8384String ThreadableWebSocketChannelClientWrapper::subprotocol() const
    8485{
    85     return String(m_subprotocol);
     86    return m_subprotocol;
    8687}
    8788
    8889void ThreadableWebSocketChannelClientWrapper::setSubprotocol(const String& subprotocol)
    8990{
    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;
    9492}
    9593
  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

    r95025 r95026  
    9494    bool m_syncMethodDone;
    9595    bool m_useHixie76Protocol;
    96     Vector<UChar> m_subprotocol;
     96    String m_subprotocol;
    9797    bool m_sendRequestResult;
    9898    unsigned long m_bufferedAmount;
Note: See TracChangeset for help on using the changeset viewer.