| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "modules/websockets/WebSocketPerMessageDeflate.h" | 33 #include "modules/websockets/WebSocketPerMessageDeflate.h" |
| 34 | 34 |
| 35 #include "core/platform/HistogramSupport.h" | |
| 36 #include "modules/websockets/WebSocketExtensionParser.h" | 35 #include "modules/websockets/WebSocketExtensionParser.h" |
| 36 #include "public/platform/Platform.h" |
| 37 #include "wtf/HashMap.h" | 37 #include "wtf/HashMap.h" |
| 38 #include "wtf/text/CString.h" | 38 #include "wtf/text/CString.h" |
| 39 #include "wtf/text/StringHash.h" | 39 #include "wtf/text/StringHash.h" |
| 40 #include "wtf/text/WTFString.h" | 40 #include "wtf/text/WTFString.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 class CompressionMessageExtensionProcessor : public WebSocketExtensionProcessor
{ | 44 class CompressionMessageExtensionProcessor : public WebSocketExtensionProcessor
{ |
| 45 WTF_MAKE_FAST_ALLOCATED; | 45 WTF_MAKE_FAST_ALLOCATED; |
| 46 WTF_MAKE_NONCOPYABLE(CompressionMessageExtensionProcessor); | 46 WTF_MAKE_NONCOPYABLE(CompressionMessageExtensionProcessor); |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 m_failureReason = "Received invalid server_max_window_bits parameter
"; | 130 m_failureReason = "Received invalid server_max_window_bits parameter
"; |
| 131 return false; | 131 return false; |
| 132 } | 132 } |
| 133 ++numProcessedParameters; | 133 ++numProcessedParameters; |
| 134 } | 134 } |
| 135 | 135 |
| 136 if (numProcessedParameters != parameters.size()) { | 136 if (numProcessedParameters != parameters.size()) { |
| 137 m_failureReason = "Received an unexpected permessage-deflate extension p
arameter"; | 137 m_failureReason = "Received an unexpected permessage-deflate extension p
arameter"; |
| 138 return false; | 138 return false; |
| 139 } | 139 } |
| 140 HistogramSupport::histogramEnumeration("WebCore.WebSocket.PerMessageDeflateC
ontextTakeOverMode", mode, WebSocketDeflater::ContextTakeOverModeMax); | 140 WebKit::Platform::current()->histogramEnumeration("WebCore.WebSocket.PerMess
ageDeflateContextTakeOverMode", mode, WebSocketDeflater::ContextTakeOverModeMax)
; |
| 141 m_compress.enable(windowBits, mode); | 141 m_compress.enable(windowBits, mode); |
| 142 // Since we don't request server_no_context_takeover and server_max_window_b
its, they should be ignored. | 142 // Since we don't request server_no_context_takeover and server_max_window_b
its, they should be ignored. |
| 143 return true; | 143 return true; |
| 144 } | 144 } |
| 145 | 145 |
| 146 WebSocketPerMessageDeflate::WebSocketPerMessageDeflate() | 146 WebSocketPerMessageDeflate::WebSocketPerMessageDeflate() |
| 147 : m_enabled(false) | 147 : m_enabled(false) |
| 148 , m_deflateOngoing(false) | 148 , m_deflateOngoing(false) |
| 149 , m_inflateOngoing(false) | 149 , m_inflateOngoing(false) |
| 150 { | 150 { |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 m_inflater->reset(); | 257 m_inflater->reset(); |
| 258 } | 258 } |
| 259 | 259 |
| 260 void WebSocketPerMessageDeflate::didFail() | 260 void WebSocketPerMessageDeflate::didFail() |
| 261 { | 261 { |
| 262 resetDeflateBuffer(); | 262 resetDeflateBuffer(); |
| 263 resetInflateBuffer(); | 263 resetInflateBuffer(); |
| 264 } | 264 } |
| 265 | 265 |
| 266 } // namespace WebCore | 266 } // namespace WebCore |
| OLD | NEW |