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

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

Issue 1232563003: Remove 'blink::WebSerializedOrigin' (1/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix. Created 5 years, 5 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
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/loader/FrameLoader.h" 43 #include "core/loader/FrameLoader.h"
44 #include "core/loader/FrameLoaderClient.h" 44 #include "core/loader/FrameLoaderClient.h"
45 #include "core/loader/MixedContentChecker.h" 45 #include "core/loader/MixedContentChecker.h"
46 #include "modules/websockets/InspectorWebSocketEvents.h" 46 #include "modules/websockets/InspectorWebSocketEvents.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"
54 #include "public/platform/WebSocketHandshakeRequestInfo.h" 53 #include "public/platform/WebSocketHandshakeRequestInfo.h"
55 #include "public/platform/WebSocketHandshakeResponseInfo.h" 54 #include "public/platform/WebSocketHandshakeResponseInfo.h"
56 #include "public/platform/WebString.h" 55 #include "public/platform/WebString.h"
57 #include "public/platform/WebURL.h" 56 #include "public/platform/WebURL.h"
58 #include "public/platform/WebVector.h" 57 #include "public/platform/WebVector.h"
59 58
60 using blink::WebSocketHandle; 59 using blink::WebSocketHandle;
61 60
62 namespace blink { 61 namespace blink {
63 62
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 575
577 DEFINE_TRACE(DocumentWebSocketChannel) 576 DEFINE_TRACE(DocumentWebSocketChannel)
578 { 577 {
579 visitor->trace(m_blobLoader); 578 visitor->trace(m_blobLoader);
580 visitor->trace(m_client); 579 visitor->trace(m_client);
581 WebSocketChannel::trace(visitor); 580 WebSocketChannel::trace(visitor);
582 ContextLifecycleObserver::trace(visitor); 581 ContextLifecycleObserver::trace(visitor);
583 } 582 }
584 583
585 } // namespace blink 584 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698