Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1284)

Side by Side Diff: Source/modules/websockets/DocumentWebSocketChannel.cpp

Issue 909013008: Move SubstituteData and UniqueIdentifier to core/fetch/ from core/loader/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/UniqueIdentifier.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
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 #include "modules/websockets/DocumentWebSocketChannel.h" 32 #include "modules/websockets/DocumentWebSocketChannel.h"
33 33
34 #include "core/dom/DOMArrayBuffer.h" 34 #include "core/dom/DOMArrayBuffer.h"
35 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
36 #include "core/dom/ExecutionContext.h" 36 #include "core/dom/ExecutionContext.h"
37 #include "core/fetch/UniqueIdentifier.h"
37 #include "core/fileapi/FileReaderLoader.h" 38 #include "core/fileapi/FileReaderLoader.h"
38 #include "core/fileapi/FileReaderLoaderClient.h" 39 #include "core/fileapi/FileReaderLoaderClient.h"
39 #include "core/frame/LocalFrame.h" 40 #include "core/frame/LocalFrame.h"
40 #include "core/inspector/ConsoleMessage.h" 41 #include "core/inspector/ConsoleMessage.h"
41 #include "core/inspector/InspectorInstrumentation.h" 42 #include "core/inspector/InspectorInstrumentation.h"
42 #include "core/inspector/InspectorTraceEvents.h" 43 #include "core/inspector/InspectorTraceEvents.h"
43 #include "core/loader/FrameLoader.h" 44 #include "core/loader/FrameLoader.h"
44 #include "core/loader/FrameLoaderClient.h" 45 #include "core/loader/FrameLoaderClient.h"
45 #include "core/loader/MixedContentChecker.h" 46 #include "core/loader/MixedContentChecker.h"
46 #include "core/loader/UniqueIdentifier.h"
47 #include "modules/websockets/WebSocketChannelClient.h" 47 #include "modules/websockets/WebSocketChannelClient.h"
48 #include "modules/websockets/WebSocketFrame.h" 48 #include "modules/websockets/WebSocketFrame.h"
49 #include "platform/Logging.h" 49 #include "platform/Logging.h"
50 #include "platform/network/WebSocketHandshakeRequest.h" 50 #include "platform/network/WebSocketHandshakeRequest.h"
51 #include "platform/weborigin/SecurityOrigin.h" 51 #include "platform/weborigin/SecurityOrigin.h"
52 #include "public/platform/Platform.h" 52 #include "public/platform/Platform.h"
53 #include "public/platform/WebSerializedOrigin.h" 53 #include "public/platform/WebSerializedOrigin.h"
54 #include "public/platform/WebSocketHandshakeRequestInfo.h" 54 #include "public/platform/WebSocketHandshakeRequestInfo.h"
55 #include "public/platform/WebSocketHandshakeResponseInfo.h" 55 #include "public/platform/WebSocketHandshakeResponseInfo.h"
56 #include "public/platform/WebString.h" 56 #include "public/platform/WebString.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 584
585 void DocumentWebSocketChannel::trace(Visitor* visitor) 585 void DocumentWebSocketChannel::trace(Visitor* visitor)
586 { 586 {
587 visitor->trace(m_blobLoader); 587 visitor->trace(m_blobLoader);
588 visitor->trace(m_client); 588 visitor->trace(m_client);
589 WebSocketChannel::trace(visitor); 589 WebSocketChannel::trace(visitor);
590 ContextLifecycleObserver::trace(visitor); 590 ContextLifecycleObserver::trace(visitor);
591 } 591 }
592 592
593 } // namespace blink 593 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/UniqueIdentifier.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698