Changeset 108439 in webkit


Ignore:
Timestamp:
Feb 21, 2012 8:26:26 PM (12 years ago)
Author:
bashi@chromium.org
Message:

Rename "reserved1" flag of WebSocketFrame to compress
​https://bugs.webkit.org/show_bug.cgi?id=79187

Source/WebCore:

WebSocket deflate-frame extension draft specification defines COMP bit.
​http://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-05#page-11

Reviewed by Kent Tamura.

No new tests. http/tests/websocket/tests/hybi/reserved-bits.html is revised to follow the change.

  • websockets/WebSocketChannel.cpp:

(WebCore):
(WebCore::WebSocketChannel::parseFrame): "reserved1" renamed "compress".
(WebCore::WebSocketChannel::processFrame): Removed reserved1 flag check.
(WebCore::makeFrameData):
(WebCore::WebSocketChannel::sendFrame):

  • websockets/WebSocketFrame.h: "reserved1" flag renamed "compress".

(WebCore::WebSocketFrame::WebSocketFrame):
(WebSocketFrame):

LayoutTests:

Reviewed by Kent Tamura.

  • http/tests/websocket/tests/hybi/reserved-bits-expected.txt: Revised to follow the change in meaning rsv1 bit.
  • http/tests/websocket/tests/hybi/reserved-bits.html: Ditto.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r108427 r108439  
     12012-02-21  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        Rename "reserved1" flag of WebSocketFrame to compress
     4        https://bugs.webkit.org/show_bug.cgi?id=79187
     5
     6        Reviewed by Kent Tamura.
     7
     8        * http/tests/websocket/tests/hybi/reserved-bits-expected.txt: Revised to follow the change in meaning rsv1 bit.
     9        * http/tests/websocket/tests/hybi/reserved-bits.html: Ditto.
     10
    1112012-02-21  Gavin Barraclough  <barraclough@apple.com>
    212

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/reserved-bits-expected.txt

    r104803 r108439  
    1 CONSOLE MESSAGE: One or more reserved bits are on: reserved1 = 1, reserved2 = 0, reserved3 = 0
    2 CONSOLE MESSAGE: One or more reserved bits are on: reserved1 = 0, reserved2 = 1, reserved3 = 0
    3 CONSOLE MESSAGE: One or more reserved bits are on: reserved1 = 0, reserved2 = 0, reserved3 = 1
     1CONSOLE MESSAGE: One or more reserved bits are on: reserved2 = 1, reserved3 = 0
     2CONSOLE MESSAGE: One or more reserved bits are on: reserved2 = 0, reserved3 = 1
    43Test whether WebSocket rejects frames whose reserved bit is on.
    54
    65On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    76
    8 Bit 1: Test started.
    9 onopen() was called.
    10 onclose() was called.
    11 PASS closeEvent.wasClean is false
    127Bit 2: Test started.
    138onopen() was called.

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html

    r99258 r108439  
    1616var closeEvent;
    1717
    18 // bitNumber must be 1, 2, or 3.
     18// bitNumber must be 2 or 3.
    1919function doTest(bitNumber)
    2020{
    … …  
    4747}
    4848
    49 doTest(1);
     49doTest(2);
    5050
    5151</script>

  • trunk/Source/WebCore/ChangeLog

    r108438 r108439  
     12012-02-21  Kenichi Ishibashi  <bashi@chromium.org>
     2
     3        Rename "reserved1" flag of WebSocketFrame to compress
     4        https://bugs.webkit.org/show_bug.cgi?id=79187
     5
     6        WebSocket deflate-frame extension draft specification defines COMP bit.
     7        http://tools.ietf.org/html/draft-tyoshino-hybi-websocket-perframe-deflate-05#page-11
     8
     9        Reviewed by Kent Tamura.
     10
     11        No new tests. http/tests/websocket/tests/hybi/reserved-bits.html is revised to follow the change.
     12
     13        * websockets/WebSocketChannel.cpp:
     14        (WebCore):
     15        (WebCore::WebSocketChannel::parseFrame): "reserved1" renamed "compress".
     16        (WebCore::WebSocketChannel::processFrame): Removed reserved1 flag check.
     17        (WebCore::makeFrameData):
     18        (WebCore::WebSocketChannel::sendFrame):
     19        * websockets/WebSocketFrame.h: "reserved1" flag renamed "compress".
     20        (WebCore::WebSocketFrame::WebSocketFrame):
     21        (WebSocketFrame):
     22
    1232012-02-21  Yael Aharon  <yael.aharon@nokia.com>
    224

  • trunk/Source/WebCore/websockets/WebSocketChannel.cpp

    r108240 r108439  
    7171// Constants for hybi-10 frame format.
    7272const unsigned char finalBit = 0x80;
    73 const unsigned char reserved1Bit = 0x40;
     73const unsigned char compressBit = 0x40;
    7474const unsigned char reserved2Bit = 0x20;
    7575const unsigned char reserved3Bit = 0x10;
    … …  
    548548
    549549    bool final = firstByte & finalBit;
    550     bool reserved1 = firstByte & reserved1Bit;
     550    bool compress = firstByte & compressBit;
    551551    bool reserved2 = firstByte & reserved2Bit;
    552552    bool reserved3 = firstByte & reserved3Bit;
    … …  
    597597    frame.opCode = static_cast<WebSocketFrame::OpCode>(opCode);
    598598    frame.final = final;
    599     frame.reserved1 = reserved1;
     599    frame.compress = compress;
    600600    frame.reserved2 = reserved2;
    601601    frame.reserved3 = reserved3;
    … …  
    625625    }
    626626
    627     if (frame.reserved1 || frame.reserved2 || frame.reserved3) {
    628         fail("One or more reserved bits are on: reserved1 = " + String::number(frame.reserved1) + ", reserved2 = " + String::number(frame.reserved2) + ", reserved3 = " + String::number(frame.reserved3));
     627    if (frame.reserved2 || frame.reserved3) {
     628        fail("One or more reserved bits are on: reserved2 = " + String::number(frame.reserved2) + ", reserved3 = " + String::number(frame.reserved3));
    629629        return false;
    630630    }
    … …  
    980980{
    981981    unsigned char firstByte = (frame.final ? finalBit : 0) | frame.opCode;
     982    if (frame.compress)
     983        firstByte |= compressBit;
    982984    frameData.append(firstByte);
    983985    if (frame.payloadLength <= maxPayloadLengthWithoutExtendedLengthField)
    … …  
    10091011
    10101012    ASSERT(!(opCode & ~opCodeMask)); // Checks whether "opCode" fits in the range of opCodes.
    1011     WebSocketFrame frame(opCode, true, true, data, dataLength);
     1013    WebSocketFrame frame(opCode, true, false, true, data, dataLength);
    10121014    Vector<char> frameData;
    10131015    makeFrameData(frame, frameData);

  • trunk/Source/WebCore/websockets/WebSocketFrame.h

    r108240 r108439  
    5252    static bool isReservedOpCode(OpCode opCode) { return !isNonControlOpCode(opCode) && !isControlOpCode(opCode); }
    5353
    54     WebSocketFrame(OpCode opCode = OpCodeInvalid, bool final = false, bool masked = false, const char* payload = 0, size_t payloadLength = 0)
     54    WebSocketFrame(OpCode opCode = OpCodeInvalid, bool final = false, bool compress = false, bool masked = false, const char* payload = 0, size_t payloadLength = 0)
    5555        : opCode(opCode)
    5656        , final(final)
    57         , reserved1(false)
     57        , compress(compress)
    5858        , reserved2(false)
    5959        , reserved3(false)
    … …  
    6666    OpCode opCode;
    6767    bool final;
    68     bool reserved1;
     68    bool compress;
    6969    bool reserved2;
    7070    bool reserved3;
Note: See TracChangeset for help on using the changeset viewer.