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

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

Issue 221823002: Oilpan: add explicit Persistent<T>(T&) and Member<T>(T&) constructors. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased and moved into platform/heap/Handle.h Created 6 years, 8 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 String sourceURL; 56 String sourceURL;
57 unsigned lineNumber = 0; 57 unsigned lineNumber = 0;
58 RefPtr<ScriptCallStack> callStack = createScriptCallStack(1, true); 58 RefPtr<ScriptCallStack> callStack = createScriptCallStack(1, true);
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, clien t, 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
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698