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

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

Issue 178663004: Oilpan: move WorkerGlobalScope to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove redundant include Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 ASSERT_UNUSED(context, context->isWorkerGlobalScope()); 434 ASSERT_UNUSED(context, context->isWorkerGlobalScope());
435 workerClientWrapper->didReceiveMessageError(); 435 workerClientWrapper->didReceiveMessageError();
436 } 436 }
437 437
438 void WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError() 438 void WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError()
439 { 439 {
440 ASSERT(isMainThread()); 440 ASSERT(isMainThread());
441 m_loaderProxy.postTaskToWorkerGlobalScope(createCallbackTask(&workerGlobalSc opeDidReceiveMessageError, m_workerClientWrapper)); 441 m_loaderProxy.postTaskToWorkerGlobalScope(createCallbackTask(&workerGlobalSc opeDidReceiveMessageError, m_workerClientWrapper));
442 } 442 }
443 443
444 WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketC hannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerGlobalScope> workerGl obalScope) 444 WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketC hannelClientWrapper> workerClientWrapper, PassRefPtrWillBeRawPtr<WorkerGlobalSco pe> workerGlobalScope)
445 : m_workerClientWrapper(workerClientWrapper) 445 : m_workerClientWrapper(workerClientWrapper)
446 , m_workerGlobalScope(workerGlobalScope) 446 , m_workerGlobalScope(workerGlobalScope)
447 , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy()) 447 , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
448 , m_syncHelper(0) 448 , m_syncHelper(0)
449 { 449 {
450 ASSERT(m_workerClientWrapper.get()); 450 ASSERT(m_workerClientWrapper.get());
451 } 451 }
452 452
453 WorkerThreadableWebSocketChannel::Bridge::~Bridge() 453 WorkerThreadableWebSocketChannel::Bridge::~Bridge()
454 { 454 {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 } 574 }
575 575
576 void WorkerThreadableWebSocketChannel::Bridge::terminatePeer() 576 void WorkerThreadableWebSocketChannel::Bridge::terminatePeer()
577 { 577 {
578 m_loaderProxy.postTaskToLoader(CallClosureTask::create(bind(&Peer::destroy, m_peer))); 578 m_loaderProxy.postTaskToLoader(CallClosureTask::create(bind(&Peer::destroy, m_peer)));
579 m_workerGlobalScope = nullptr; 579 m_workerGlobalScope = nullptr;
580 m_syncHelper = 0; 580 m_syncHelper = 0;
581 } 581 }
582 582
583 } // namespace WebCore 583 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698