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

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

Issue 344593002: Qualify RuntimeEnabledFeatures.h and remove unnecessary include dir. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebaseline Created 6 years, 6 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 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
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/WebSocketChannel.h" 33 #include "modules/websockets/WebSocketChannel.h"
34 34
35 #include "RuntimeEnabledFeatures.h"
36 #include "bindings/v8/ScriptCallStackFactory.h" 35 #include "bindings/v8/ScriptCallStackFactory.h"
37 #include "core/dom/Document.h" 36 #include "core/dom/Document.h"
38 #include "core/dom/ExecutionContext.h" 37 #include "core/dom/ExecutionContext.h"
39 #include "core/inspector/ScriptCallStack.h" 38 #include "core/inspector/ScriptCallStack.h"
40 #include "core/workers/WorkerGlobalScope.h" 39 #include "core/workers/WorkerGlobalScope.h"
41 #include "core/workers/WorkerRunLoop.h" 40 #include "core/workers/WorkerRunLoop.h"
42 #include "core/workers/WorkerThread.h" 41 #include "core/workers/WorkerThread.h"
43 #include "modules/websockets/MainThreadWebSocketChannel.h" 42 #include "modules/websockets/MainThreadWebSocketChannel.h"
44 #include "modules/websockets/NewWebSocketChannelImpl.h" 43 #include "modules/websockets/NewWebSocketChannelImpl.h"
45 #include "modules/websockets/ThreadableWebSocketChannelClientWrapper.h" 44 #include "modules/websockets/ThreadableWebSocketChannelClientWrapper.h"
46 #include "modules/websockets/WebSocketChannelClient.h" 45 #include "modules/websockets/WebSocketChannelClient.h"
47 #include "modules/websockets/WorkerThreadableWebSocketChannel.h" 46 #include "modules/websockets/WorkerThreadableWebSocketChannel.h"
47 #include "platform/RuntimeEnabledFeatures.h"
48 48
49 namespace WebCore { 49 namespace WebCore {
50 50
51 PassRefPtrWillBeRawPtr<WebSocketChannel> WebSocketChannel::create(ExecutionConte xt* context, WebSocketChannelClient* client) 51 PassRefPtrWillBeRawPtr<WebSocketChannel> WebSocketChannel::create(ExecutionConte xt* context, WebSocketChannelClient* client)
52 { 52 {
53 ASSERT(context); 53 ASSERT(context);
54 ASSERT(client); 54 ASSERT(client);
55 55
56 String sourceURL; 56 String sourceURL;
57 unsigned lineNumber = 0; 57 unsigned lineNumber = 0;
58 RefPtrWillBeRawPtr<ScriptCallStack> callStack = createScriptCallStack(1, tru e); 58 RefPtrWillBeRawPtr<ScriptCallStack> callStack = createScriptCallStack(1, tru e);
59 if (callStack && callStack->size()) { 59 if (callStack && callStack->size()) {
60 sourceURL = callStack->at(0).sourceURL(); 60 sourceURL = callStack->at(0).sourceURL();
61 lineNumber = callStack->at(0).lineNumber(); 61 lineNumber = callStack->at(0).lineNumber();
62 } 62 }
63 63
64 if (context->isWorkerGlobalScope()) { 64 if (context->isWorkerGlobalScope()) {
65 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); 65 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
66 return WorkerThreadableWebSocketChannel::create(*workerGlobalScope, clie nt, sourceURL, lineNumber); 66 return WorkerThreadableWebSocketChannel::create(*workerGlobalScope, clie nt, sourceURL, lineNumber);
67 } 67 }
68 68
69 Document* document = toDocument(context); 69 Document* document = toDocument(context);
70 if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) { 70 if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) {
71 return NewWebSocketChannelImpl::create(document, client, sourceURL, line Number); 71 return NewWebSocketChannelImpl::create(document, client, sourceURL, line Number);
72 } 72 }
73 return MainThreadWebSocketChannel::create(document, client, sourceURL, lineN umber); 73 return MainThreadWebSocketChannel::create(document, client, sourceURL, lineN umber);
74 } 74 }
75 75
76 } // namespace WebCore 76 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698