Changeset 95025 in webkit


Ignore:
Timestamp:
Sep 13, 2011 6:25:18 AM (13 years ago)
Author:
yutak@chromium.org
Message:

ThreadableWebSocketChannelClientWrapper shouldn't have a String in it.
https://bugs.webkit.org/show_bug.cgi?id=67908

Reviewed by David Levin.

Replace a String member variable in ThreadableWebSocketChannelClientWrapper with Vector<UChar>.

No change in functionality, thus no new tests. WebSocket worker tests
(tests under http/tests/websocket/tests/{hixie76,hybi}/workers/) should keep passing.

  • websockets/ThreadableWebSocketChannelClientWrapper.cpp:

(WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
(WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol):
Create a String from Vector<UChar>.
(WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
Copy the content of the given String into Vector.

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

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r95023 r95025  
     12011-09-13  Yuta Kitamura  <yutak@chromium.org>
     2
     3        ThreadableWebSocketChannelClientWrapper shouldn't have a String in it.
     4        https://bugs.webkit.org/show_bug.cgi?id=67908
     5
     6        Reviewed by David Levin.
     7
     8        Replace a String member variable in ThreadableWebSocketChannelClientWrapper with Vector<UChar>.
     9
     10        No change in functionality, thus no new tests. WebSocket worker tests
     11        (tests under http/tests/websocket/tests/{hixie76,hybi}/workers/) should keep passing.
     12
     13        * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
     14        (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
     15        (WebCore::ThreadableWebSocketChannelClientWrapper::subprotocol):
     16        Create a String from Vector<UChar>.
     17        (WebCore::ThreadableWebSocketChannelClientWrapper::setSubprotocol):
     18        Copy the content of the given String into Vector.
     19        * websockets/ThreadableWebSocketChannelClientWrapper.h:
     20
    1212011-09-13  Fumitoshi Ukai  <ukai@chromium.org>
    222
  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp

    r94482 r95025  
    4545    , m_syncMethodDone(false)
    4646    , m_useHixie76Protocol(true)
    47     , m_subprotocol("")
    4847    , m_sendRequestResult(false)
    4948    , m_bufferedAmount(0)
     
    8483String ThreadableWebSocketChannelClientWrapper::subprotocol() const
    8584{
    86     return m_subprotocol;
     85    return String(m_subprotocol);
    8786}
    8887
    8988void ThreadableWebSocketChannelClientWrapper::setSubprotocol(const String& subprotocol)
    9089{
    91     m_subprotocol = subprotocol;
     90    unsigned length = subprotocol.length();
     91    m_subprotocol.resize(length);
     92    if (length)
     93        memcpy(m_subprotocol.data(), subprotocol.characters(), sizeof(UChar) * length);
    9294}
    9395
  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

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