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 25 matching lines...) Expand all Loading... |
36 #include "bindings/core/v8/ScriptController.h" | 36 #include "bindings/core/v8/ScriptController.h" |
37 #include "core/dom/Document.h" | 37 #include "core/dom/Document.h" |
38 #include "core/dom/ExceptionCode.h" | 38 #include "core/dom/ExceptionCode.h" |
39 #include "core/dom/ExecutionContext.h" | 39 #include "core/dom/ExecutionContext.h" |
40 #include "core/events/MessageEvent.h" | 40 #include "core/events/MessageEvent.h" |
41 #include "core/fileapi/Blob.h" | 41 #include "core/fileapi/Blob.h" |
42 #include "core/frame/ConsoleTypes.h" | 42 #include "core/frame/ConsoleTypes.h" |
43 #include "core/frame/LocalDOMWindow.h" | 43 #include "core/frame/LocalDOMWindow.h" |
44 #include "core/frame/LocalFrame.h" | 44 #include "core/frame/LocalFrame.h" |
45 #include "core/frame/csp/ContentSecurityPolicy.h" | 45 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 46 #include "core/inspector/ConsoleMessage.h" |
46 #include "core/inspector/ScriptCallStack.h" | 47 #include "core/inspector/ScriptCallStack.h" |
47 #include "modules/websockets/CloseEvent.h" | 48 #include "modules/websockets/CloseEvent.h" |
48 #include "platform/Logging.h" | 49 #include "platform/Logging.h" |
49 #include "platform/blob/BlobData.h" | 50 #include "platform/blob/BlobData.h" |
50 #include "platform/heap/Handle.h" | 51 #include "platform/heap/Handle.h" |
51 #include "platform/weborigin/KnownPorts.h" | 52 #include "platform/weborigin/KnownPorts.h" |
52 #include "platform/weborigin/SecurityOrigin.h" | 53 #include "platform/weborigin/SecurityOrigin.h" |
53 #include "public/platform/Platform.h" | 54 #include "public/platform/Platform.h" |
54 #include "wtf/ArrayBuffer.h" | 55 #include "wtf/ArrayBuffer.h" |
55 #include "wtf/ArrayBufferView.h" | 56 #include "wtf/ArrayBufferView.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 ScriptWrappable::init(this); | 240 ScriptWrappable::init(this); |
240 } | 241 } |
241 | 242 |
242 DOMWebSocket::~DOMWebSocket() | 243 DOMWebSocket::~DOMWebSocket() |
243 { | 244 { |
244 ASSERT(!m_channel); | 245 ASSERT(!m_channel); |
245 } | 246 } |
246 | 247 |
247 void DOMWebSocket::logError(const String& message) | 248 void DOMWebSocket::logError(const String& message) |
248 { | 249 { |
249 executionContext()->addConsoleMessage(JSMessageSource, ErrorMessageLevel, me
ssage); | 250 executionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource
, ErrorMessageLevel, message)); |
250 } | 251 } |
251 | 252 |
252 PassRefPtrWillBeRawPtr<DOMWebSocket> DOMWebSocket::create(ExecutionContext* cont
ext, const String& url, ExceptionState& exceptionState) | 253 PassRefPtrWillBeRawPtr<DOMWebSocket> DOMWebSocket::create(ExecutionContext* cont
ext, const String& url, ExceptionState& exceptionState) |
253 { | 254 { |
254 Vector<String> protocols; | 255 Vector<String> protocols; |
255 return create(context, url, protocols, exceptionState); | 256 return create(context, url, protocols, exceptionState); |
256 } | 257 } |
257 | 258 |
258 PassRefPtrWillBeRawPtr<DOMWebSocket> DOMWebSocket::create(ExecutionContext* cont
ext, const String& url, const Vector<String>& protocols, ExceptionState& excepti
onState) | 259 PassRefPtrWillBeRawPtr<DOMWebSocket> DOMWebSocket::create(ExecutionContext* cont
ext, const String& url, const Vector<String>& protocols, ExceptionState& excepti
onState) |
259 { | 260 { |
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
689 | 690 |
690 void DOMWebSocket::trace(Visitor* visitor) | 691 void DOMWebSocket::trace(Visitor* visitor) |
691 { | 692 { |
692 visitor->trace(m_channel); | 693 visitor->trace(m_channel); |
693 visitor->trace(m_eventQueue); | 694 visitor->trace(m_eventQueue); |
694 WebSocketChannelClient::trace(visitor); | 695 WebSocketChannelClient::trace(visitor); |
695 EventTargetWithInlineData::trace(visitor); | 696 EventTargetWithInlineData::trace(visitor); |
696 } | 697 } |
697 | 698 |
698 } // namespace blink | 699 } // namespace blink |
OLD | NEW |