Changeset 108752 in webkit


Ignore:
Timestamp:
Feb 24, 2012 1:47:47 AM (12 years ago)
Author:
bashi@chromium.org
Message:

Unreviewed, rolling out r108731.
http://trac.webkit.org/changeset/108731
https://bugs.webkit.org/show_bug.cgi?id=79464

Broke Chromium Win tests (Requested by bashi on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-02-24

Source/JavaScriptCore:

  • wtf/Platform.h:

Source/WebCore:

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • websockets/WebSocket.cpp:

(WebCore::WebSocket::didConnect):

  • websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::connect):
(WebCore::WebSocketChannel::fail):
(WebCore::WebSocketChannel::processFrame):
(WebCore::WebSocketChannel::sendFrame):

  • websockets/WebSocketChannel.h:
  • websockets/WebSocketDeflateFramer.cpp: Removed.
  • websockets/WebSocketDeflateFramer.h: Removed.

LayoutTests:

  • http/tests/websocket/tests/hybi/compressed-control-frame-expected.txt: Removed.
  • http/tests/websocket/tests/hybi/compressed-control-frame.html: Removed.
  • http/tests/websocket/tests/hybi/compressed-control-frame_wsh.py: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff-expected.txt: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff.html: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter-expected.txt: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter_wsh.py: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-parameter-expected.txt: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame-parameter.html: Removed.
  • http/tests/websocket/tests/hybi/deflate-frame_wsh.py: Removed.
  • http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header-expected.txt:
  • http/tests/websocket/tests/hybi/send-file-blob_wsh.py:

(web_socket_transfer_data):

Location:
trunk
Files:
13 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r108750 r108752  
     12012-02-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r108731.
     4        http://trac.webkit.org/changeset/108731
     5        https://bugs.webkit.org/show_bug.cgi?id=79464
     6
     7        Broke Chromium Win tests (Requested by bashi on #webkit).
     8
     9        * http/tests/websocket/tests/hybi/compressed-control-frame-expected.txt: Removed.
     10        * http/tests/websocket/tests/hybi/compressed-control-frame.html: Removed.
     11        * http/tests/websocket/tests/hybi/compressed-control-frame_wsh.py: Removed.
     12        * http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff-expected.txt: Removed.
     13        * http/tests/websocket/tests/hybi/deflate-frame-comp-bit-onoff.html: Removed.
     14        * http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter-expected.txt: Removed.
     15        * http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html: Removed.
     16        * http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter_wsh.py: Removed.
     17        * http/tests/websocket/tests/hybi/deflate-frame-parameter-expected.txt: Removed.
     18        * http/tests/websocket/tests/hybi/deflate-frame-parameter.html: Removed.
     19        * http/tests/websocket/tests/hybi/deflate-frame_wsh.py: Removed.
     20        * http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header-expected.txt:
     21        * http/tests/websocket/tests/hybi/send-file-blob_wsh.py:
     22        (web_socket_transfer_data):
     23
    1242012-02-24  Mike Lawther  <mikelawther@chromium.org>
    225
  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header-expected.txt

    r108731 r108752  
    1 CONSOLE MESSAGE: Received unexpected extension: x-foo
     1CONSOLE MESSAGE: Received unexpected Sec-WebSocket-Extensions header
    22Test whether WebSocket handshake fails if the server sends Sec-WebSocket-Extensions header.
    33
  • trunk/LayoutTests/http/tests/websocket/tests/hybi/send-file-blob_wsh.py

    r108731 r108752  
    11from mod_pywebsocket import common
    22from mod_pywebsocket import msgutil
    3 
    4 
    5 def _retrieve_frame(stream):
    6     # FIXME: Use better API.
    7     frame = stream._receive_frame_as_frame_object()
    8     for frame_filter in stream._options.incoming_frame_filters:
    9         frame_filter.filter(frame)
    10     return frame
    113
    124
     
    1911
    2012    for test_number, expected_message in enumerate(expected_messages):
    21         frame = _retrieve_frame(request.ws_stream)
    22         if frame.opcode == common.OPCODE_BINARY and frame.payload == expected_message and frame.fin:
     13        # FIXME: Use better API.
     14        opcode, payload, final, unused_reserved1, unused_reserved2, unused_reserved3 = request.ws_stream._receive_frame()
     15        if opcode == common.OPCODE_BINARY and payload == expected_message and final:
    2316            msgutil.send_message(request, 'PASS: Message #%d.' % test_number)
    2417        else:
    25             msgutil.send_message(request, 'FAIL: Message #%d: Received unexpected frame: opcode = %r, payload = %r, final = %r' % (test_number, frame.opcode, frame.payload, frame.fin))
     18            msgutil.send_message(request, 'FAIL: Message #%d: Received unexpected frame: opcode = %r, payload = %r, final = %r' % (test_number, opcode, payload, final))
    2619
    2720
  • trunk/Source/JavaScriptCore/ChangeLog

    r108747 r108752  
     12012-02-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r108731.
     4        http://trac.webkit.org/changeset/108731
     5        https://bugs.webkit.org/show_bug.cgi?id=79464
     6
     7        Broke Chromium Win tests (Requested by bashi on #webkit).
     8
     9        * wtf/Platform.h:
     10
    1112012-02-24  Andrew Lo  <anlo@rim.com>
    212
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r108747 r108752  
    11951195#endif
    11961196
    1197 #if !PLATFORM(QT) && !PLATFORM(EFL)
    1198 #define WTF_USE_ZLIB 1
    1199 #endif
    1200 
    12011197#endif /* WTF_Platform_h */
  • trunk/Source/WebCore/CMakeLists.txt

    r108746 r108752  
    20612061        websockets/WebSocket.cpp
    20622062        websockets/WebSocketChannel.cpp
    2063         websockets/WebSocketDeflateFramer.cpp
    20642063        websockets/WebSocketExtensionDispatcher.cpp
    20652064        websockets/WebSocketHandshake.cpp
  • trunk/Source/WebCore/ChangeLog

    r108751 r108752  
     12012-02-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r108731.
     4        http://trac.webkit.org/changeset/108731
     5        https://bugs.webkit.org/show_bug.cgi?id=79464
     6
     7        Broke Chromium Win tests (Requested by bashi on #webkit).
     8
     9        * CMakeLists.txt:
     10        * GNUmakefile.list.am:
     11        * Target.pri:
     12        * WebCore.gyp/WebCore.gyp:
     13        * WebCore.gypi:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * websockets/WebSocket.cpp:
     17        (WebCore::WebSocket::didConnect):
     18        * websockets/WebSocketChannel.cpp:
     19        (WebCore::WebSocketChannel::connect):
     20        (WebCore::WebSocketChannel::fail):
     21        (WebCore::WebSocketChannel::processFrame):
     22        (WebCore::WebSocketChannel::sendFrame):
     23        * websockets/WebSocketChannel.h:
     24        * websockets/WebSocketDeflateFramer.cpp: Removed.
     25        * websockets/WebSocketDeflateFramer.h: Removed.
     26
    1272012-02-22  Vsevolod Vlasov  <vsevik@chromium.org>
    228
  • trunk/Source/WebCore/GNUmakefile.list.am

    r108746 r108752  
    43454345        Source/WebCore/websockets/WebSocket.cpp \
    43464346        Source/WebCore/websockets/WebSocket.h \
    4347         Source/WebCore/websockets/WebSocketDeflateFramer.cpp \
    4348         Source/WebCore/websockets/WebSocketDeflateFramer.h \
    43494347        Source/WebCore/websockets/WebSocketDeflater.cpp \
    43504348        Source/WebCore/websockets/WebSocketDeflater.h \
  • trunk/Source/WebCore/Target.pri

    r108746 r108752  
    36763676        websockets/WebSocketChannel.h \
    36773677        websockets/WebSocketChannelClient.h \
    3678         websockets/WebSocketDeflateFramer.h \
    36793678        websockets/WebSocketExtensionDispatcher.h \
    36803679        websockets/WebSocketExtensionProcessor.h \
     
    36883687        websockets/WebSocket.cpp \
    36893688        websockets/WebSocketChannel.cpp \
    3690         websockets/WebSocketDeflateFramer.cpp \
    36913689        websockets/WebSocketExtensionDispatcher.cpp \
    36923690        websockets/WebSocketHandshake.cpp \
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r108733 r108752  
    11961196        '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
    11971197        '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
    1198         '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',
    11991198        '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
    12001199        '<(libjpeg_gyp_path):libjpeg',
  • trunk/Source/WebCore/WebCore.gypi

    r108746 r108752  
    48334833            'websockets/WebSocketChannel.h',
    48344834            'websockets/WebSocketChannelClient.h',
    4835             'websockets/WebSocketDeflateFramer.cpp',
    4836             'websockets/WebSocketDeflateFramer.h',
    48374835            'websockets/WebSocketDeflater.cpp',
    48384836            'websockets/WebSocketDeflater.h',
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r108746 r108752  
    7347573475                        </File>
    7347673476                        <File
    73477                                 RelativePath="..\websockets\WebSocketDeflateFramer.cpp"
    73478                                 >
    73479                         </File>
    73480                         <File
    73481                                 RelativePath="..\websockets\WebSocketDeflateFramer.h"
    73482                                 >
    73483                         </File>
    73484                         <File
    7348573477                                RelativePath="..\websockets\WebSocketDeflater.cpp"
    7348673478                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r108746 r108752  
    13681368                4A1E71A514E106AC00626F9D /* JSShadowRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */; };
    13691369                4A1E71A614E106AC00626F9D /* JSShadowRoot.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A1E71A414E106AC00626F9D /* JSShadowRoot.h */; };
    1370                 4A29222B14F468BA0021F77E /* WebSocketDeflateFramer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A29222914F468BA0021F77E /* WebSocketDeflateFramer.cpp */; };
    1371                 4A29222C14F468BA0021F77E /* WebSocketDeflateFramer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A29222A14F468BA0021F77E /* WebSocketDeflateFramer.h */; };
    13721370                4A4A234614F1E1440046FBF1 /* WebSocketFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */; };
    13731371                4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */; };
     
    82358233                4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSShadowRoot.cpp; sourceTree = "<group>"; };
    82368234                4A1E71A414E106AC00626F9D /* JSShadowRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSShadowRoot.h; sourceTree = "<group>"; };
    8237                 4A29222914F468BA0021F77E /* WebSocketDeflateFramer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketDeflateFramer.cpp; sourceTree = "<group>"; };
    8238                 4A29222A14F468BA0021F77E /* WebSocketDeflateFramer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketDeflateFramer.h; sourceTree = "<group>"; };
    82398235                4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketFrame.h; sourceTree = "<group>"; };
    82408236                4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureValue.cpp; sourceTree = "<group>"; };
     
    1486514861                                510D4A48103177A20049EA54 /* WebSocketChannel.h */,
    1486614862                                510D4A49103177A20049EA54 /* WebSocketChannelClient.h */,
    14867                                 4A29222914F468BA0021F77E /* WebSocketDeflateFramer.cpp */,
    14868                                 4A29222A14F468BA0021F77E /* WebSocketDeflateFramer.h */,
    1486914863                                4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */,
    1487014864                                4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */,
     
    2426124255                                510D4A4F103177A20049EA54 /* WebSocketChannel.h in Headers */,
    2426224256                                510D4A50103177A20049EA54 /* WebSocketChannelClient.h in Headers */,
    24263                                 4A29222C14F468BA0021F77E /* WebSocketDeflateFramer.h in Headers */,
    2426424257                                4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */,
    2426524258                                4A957F0714E241300049DBFB /* WebSocketExtensionDispatcher.h in Headers */,
     
    2722127214                                518A34C11026C831001B6896 /* WebSocket.cpp in Sources */,
    2722227215                                510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */,
    27223                                 4A29222B14F468BA0021F77E /* WebSocketDeflateFramer.cpp in Sources */,
    2722427216                                4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */,
    2722527217                                4A957F0614E2412A0049DBFB /* WebSocketExtensionDispatcher.cpp in Sources */,
  • trunk/Source/WebCore/websockets/WebSocket.cpp

    r108731 r108752  
    479479    m_state = OPEN;
    480480    m_subprotocol = m_channel->subprotocol();
    481     m_extensions = m_channel->extensions();
    482481    dispatchEvent(Event::create(eventNames().openEvent, false, false));
    483482}
  • trunk/Source/WebCore/websockets/WebSocketChannel.cpp

    r108731 r108752  
    128128    m_handshake = adoptPtr(new WebSocketHandshake(url, protocol, m_document, m_useHixie76Protocol));
    129129    m_handshake->reset();
    130     if (!m_useHixie76Protocol && m_deflateFramer.canDeflate())
    131         m_handshake->addExtensionProcessor(m_deflateFramer.createExtensionProcessor());
    132130    if (m_identifier)
    133131        InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url, m_document->url());
     
    231229        if (m_buffer)
    232230            skipBuffer(m_bufferSize); // Save memory.
    233         m_deflateFramer.didFail();
    234231        m_hasContinuousFrame = false;
    235232        m_continuousFrameData.clear();
     
    621618    ASSERT(m_buffer < frameEnd);
    622619    ASSERT(frameEnd <= m_buffer + m_bufferSize);
    623 
    624     InflateResultHolder inflateResult = m_deflateFramer.inflate(frame);
    625     if (!inflateResult.succeeded()) {
    626         fail(inflateResult.failureReason());
    627         return false;
    628     }
    629620
    630621    // Validate the frame data.
     
    10211012    ASSERT(!(opCode & ~opCodeMask)); // Checks whether "opCode" fits in the range of opCodes.
    10221013    WebSocketFrame frame(opCode, true, false, true, data, dataLength);
    1023 
    1024     DeflateResultHolder deflateResult = m_deflateFramer.deflate(frame);
    1025     if (!deflateResult.succeeded()) {
    1026         fail(deflateResult.failureReason());
    1027         return false;
    1028     }
    1029 
    10301014    Vector<char> frameData;
    10311015    makeFrameData(frame, frameData);
  • trunk/Source/WebCore/websockets/WebSocketChannel.h

    r108731 r108752  
    3838#include "ThreadableWebSocketChannel.h"
    3939#include "Timer.h"
    40 #include "WebSocketDeflateFramer.h"
    4140#include "WebSocketFrame.h"
    4241#include "WebSocketHandshake.h"
     
    233232    BlobLoaderStatus m_blobLoaderStatus;
    234233#endif
    235 
    236     WebSocketDeflateFramer m_deflateFramer;
    237234};
    238235
Note: See TracChangeset for help on using the changeset viewer.