Changeset 108752 in webkit
- Timestamp:
- Feb 24, 2012 1:47:47 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 13 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r108750 r108752 1 2012-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 1 24 2012-02-24 Mike Lawther <mikelawther@chromium.org> 2 25 -
trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header-expected.txt
r108731 r108752 1 CONSOLE MESSAGE: Received unexpected extension: x-foo1 CONSOLE MESSAGE: Received unexpected Sec-WebSocket-Extensions header 2 2 Test whether WebSocket handshake fails if the server sends Sec-WebSocket-Extensions header. 3 3 -
trunk/LayoutTests/http/tests/websocket/tests/hybi/send-file-blob_wsh.py
r108731 r108752 1 1 from mod_pywebsocket import common 2 2 from 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 frame11 3 12 4 … … 19 11 20 12 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: 23 16 msgutil.send_message(request, 'PASS: Message #%d.' % test_number) 24 17 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)) 26 19 27 20 -
trunk/Source/JavaScriptCore/ChangeLog
r108747 r108752 1 2012-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 1 11 2012-02-24 Andrew Lo <anlo@rim.com> 2 12 -
trunk/Source/JavaScriptCore/wtf/Platform.h
r108747 r108752 1195 1195 #endif 1196 1196 1197 #if !PLATFORM(QT) && !PLATFORM(EFL)1198 #define WTF_USE_ZLIB 11199 #endif1200 1201 1197 #endif /* WTF_Platform_h */ -
trunk/Source/WebCore/CMakeLists.txt
r108746 r108752 2061 2061 websockets/WebSocket.cpp 2062 2062 websockets/WebSocketChannel.cpp 2063 websockets/WebSocketDeflateFramer.cpp2064 2063 websockets/WebSocketExtensionDispatcher.cpp 2065 2064 websockets/WebSocketHandshake.cpp -
trunk/Source/WebCore/ChangeLog
r108751 r108752 1 2012-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 1 27 2012-02-22 Vsevolod Vlasov <vsevik@chromium.org> 2 28 -
trunk/Source/WebCore/GNUmakefile.list.am
r108746 r108752 4345 4345 Source/WebCore/websockets/WebSocket.cpp \ 4346 4346 Source/WebCore/websockets/WebSocket.h \ 4347 Source/WebCore/websockets/WebSocketDeflateFramer.cpp \4348 Source/WebCore/websockets/WebSocketDeflateFramer.h \4349 4347 Source/WebCore/websockets/WebSocketDeflater.cpp \ 4350 4348 Source/WebCore/websockets/WebSocketDeflater.h \ -
trunk/Source/WebCore/Target.pri
r108746 r108752 3676 3676 websockets/WebSocketChannel.h \ 3677 3677 websockets/WebSocketChannelClient.h \ 3678 websockets/WebSocketDeflateFramer.h \3679 3678 websockets/WebSocketExtensionDispatcher.h \ 3680 3679 websockets/WebSocketExtensionProcessor.h \ … … 3688 3687 websockets/WebSocket.cpp \ 3689 3688 websockets/WebSocketChannel.cpp \ 3690 websockets/WebSocketDeflateFramer.cpp \3691 3689 websockets/WebSocketExtensionDispatcher.cpp \ 3692 3690 websockets/WebSocketHandshake.cpp \ -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r108733 r108752 1196 1196 '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', 1197 1197 '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', 1198 '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib',1199 1198 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', 1200 1199 '<(libjpeg_gyp_path):libjpeg', -
trunk/Source/WebCore/WebCore.gypi
r108746 r108752 4833 4833 'websockets/WebSocketChannel.h', 4834 4834 'websockets/WebSocketChannelClient.h', 4835 'websockets/WebSocketDeflateFramer.cpp',4836 'websockets/WebSocketDeflateFramer.h',4837 4835 'websockets/WebSocketDeflater.cpp', 4838 4836 'websockets/WebSocketDeflater.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r108746 r108752 73475 73475 </File> 73476 73476 <File 73477 RelativePath="..\websockets\WebSocketDeflateFramer.cpp"73478 >73479 </File>73480 <File73481 RelativePath="..\websockets\WebSocketDeflateFramer.h"73482 >73483 </File>73484 <File73485 73477 RelativePath="..\websockets\WebSocketDeflater.cpp" 73486 73478 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r108746 r108752 1368 1368 4A1E71A514E106AC00626F9D /* JSShadowRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */; }; 1369 1369 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 */; };1372 1370 4A4A234614F1E1440046FBF1 /* WebSocketFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */; }; 1373 1371 4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */; }; … … 8235 8233 4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSShadowRoot.cpp; sourceTree = "<group>"; }; 8236 8234 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>"; };8239 8235 4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketFrame.h; sourceTree = "<group>"; }; 8240 8236 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureValue.cpp; sourceTree = "<group>"; }; … … 14865 14861 510D4A48103177A20049EA54 /* WebSocketChannel.h */, 14866 14862 510D4A49103177A20049EA54 /* WebSocketChannelClient.h */, 14867 4A29222914F468BA0021F77E /* WebSocketDeflateFramer.cpp */,14868 4A29222A14F468BA0021F77E /* WebSocketDeflateFramer.h */,14869 14863 4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */, 14870 14864 4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */, … … 24261 24255 510D4A4F103177A20049EA54 /* WebSocketChannel.h in Headers */, 24262 24256 510D4A50103177A20049EA54 /* WebSocketChannelClient.h in Headers */, 24263 4A29222C14F468BA0021F77E /* WebSocketDeflateFramer.h in Headers */,24264 24257 4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */, 24265 24258 4A957F0714E241300049DBFB /* WebSocketExtensionDispatcher.h in Headers */, … … 27221 27214 518A34C11026C831001B6896 /* WebSocket.cpp in Sources */, 27222 27215 510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */, 27223 4A29222B14F468BA0021F77E /* WebSocketDeflateFramer.cpp in Sources */,27224 27216 4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */, 27225 27217 4A957F0614E2412A0049DBFB /* WebSocketExtensionDispatcher.cpp in Sources */, -
trunk/Source/WebCore/websockets/WebSocket.cpp
r108731 r108752 479 479 m_state = OPEN; 480 480 m_subprotocol = m_channel->subprotocol(); 481 m_extensions = m_channel->extensions();482 481 dispatchEvent(Event::create(eventNames().openEvent, false, false)); 483 482 } -
trunk/Source/WebCore/websockets/WebSocketChannel.cpp
r108731 r108752 128 128 m_handshake = adoptPtr(new WebSocketHandshake(url, protocol, m_document, m_useHixie76Protocol)); 129 129 m_handshake->reset(); 130 if (!m_useHixie76Protocol && m_deflateFramer.canDeflate())131 m_handshake->addExtensionProcessor(m_deflateFramer.createExtensionProcessor());132 130 if (m_identifier) 133 131 InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url, m_document->url()); … … 231 229 if (m_buffer) 232 230 skipBuffer(m_bufferSize); // Save memory. 233 m_deflateFramer.didFail();234 231 m_hasContinuousFrame = false; 235 232 m_continuousFrameData.clear(); … … 621 618 ASSERT(m_buffer < frameEnd); 622 619 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 }629 620 630 621 // Validate the frame data. … … 1021 1012 ASSERT(!(opCode & ~opCodeMask)); // Checks whether "opCode" fits in the range of opCodes. 1022 1013 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 1030 1014 Vector<char> frameData; 1031 1015 makeFrameData(frame, frameData); -
trunk/Source/WebCore/websockets/WebSocketChannel.h
r108731 r108752 38 38 #include "ThreadableWebSocketChannel.h" 39 39 #include "Timer.h" 40 #include "WebSocketDeflateFramer.h"41 40 #include "WebSocketFrame.h" 42 41 #include "WebSocketHandshake.h" … … 233 232 BlobLoaderStatus m_blobLoaderStatus; 234 233 #endif 235 236 WebSocketDeflateFramer m_deflateFramer;237 234 }; 238 235
Note: See TracChangeset
for help on using the changeset viewer.