| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 } | 443 } |
| 444 if (binaryType == "arraybuffer") { | 444 if (binaryType == "arraybuffer") { |
| 445 m_binaryType = BinaryTypeArrayBuffer; | 445 m_binaryType = BinaryTypeArrayBuffer; |
| 446 return; | 446 return; |
| 447 } | 447 } |
| 448 executionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "'
" + binaryType + "' is not a valid value for binaryType; binaryType remains unch
anged."); | 448 executionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, "'
" + binaryType + "' is not a valid value for binaryType; binaryType remains unch
anged."); |
| 449 } | 449 } |
| 450 | 450 |
| 451 const AtomicString& WebSocket::interfaceName() const | 451 const AtomicString& WebSocket::interfaceName() const |
| 452 { | 452 { |
| 453 return eventNames().interfaceForWebSocket; | 453 return EventTargetNames::WebSocket; |
| 454 } | 454 } |
| 455 | 455 |
| 456 ExecutionContext* WebSocket::executionContext() const | 456 ExecutionContext* WebSocket::executionContext() const |
| 457 { | 457 { |
| 458 return ActiveDOMObject::executionContext(); | 458 return ActiveDOMObject::executionContext(); |
| 459 } | 459 } |
| 460 | 460 |
| 461 void WebSocket::contextDestroyed() | 461 void WebSocket::contextDestroyed() |
| 462 { | 462 { |
| 463 LOG(Network, "WebSocket %p contextDestroyed()", this); | 463 LOG(Network, "WebSocket %p contextDestroyed()", this); |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0
x10000; | 625 static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0
x10000; |
| 626 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength; | 626 size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength; |
| 627 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength) | 627 if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength) |
| 628 overhead += 8; | 628 overhead += 8; |
| 629 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength) | 629 else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength) |
| 630 overhead += 2; | 630 overhead += 2; |
| 631 return overhead; | 631 return overhead; |
| 632 } | 632 } |
| 633 | 633 |
| 634 } // namespace WebCore | 634 } // namespace WebCore |
| OLD | NEW |