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

Side by Side Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Issue 2657443005: Migrate WTF::HashSet::add() to ::insert() [part 1 of N] (Closed)
Patch Set: Created 3 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) 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 std::unique_ptr<WebWorkerContentSettingsClientProxy> contentSettingsClient) 94 std::unique_ptr<WebWorkerContentSettingsClientProxy> contentSettingsClient)
95 : m_workerContextClient(std::move(client)), 95 : m_workerContextClient(std::move(client)),
96 m_contentSettingsClient(std::move(contentSettingsClient)), 96 m_contentSettingsClient(std::move(contentSettingsClient)),
97 m_workerInspectorProxy(WorkerInspectorProxy::create()), 97 m_workerInspectorProxy(WorkerInspectorProxy::create()),
98 m_webView(nullptr), 98 m_webView(nullptr),
99 m_mainFrame(nullptr), 99 m_mainFrame(nullptr),
100 m_loadingShadowPage(false), 100 m_loadingShadowPage(false),
101 m_askedToTerminate(false), 101 m_askedToTerminate(false),
102 m_pauseAfterDownloadState(DontPauseAfterDownload), 102 m_pauseAfterDownloadState(DontPauseAfterDownload),
103 m_waitingForDebuggerState(NotWaitingForDebugger) { 103 m_waitingForDebuggerState(NotWaitingForDebugger) {
104 runningWorkerInstances().add(this); 104 runningWorkerInstances().insert(this);
105 } 105 }
106 106
107 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl() { 107 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl() {
108 // Prevent onScriptLoaderFinished from deleting 'this'. 108 // Prevent onScriptLoaderFinished from deleting 'this'.
109 m_askedToTerminate = true; 109 m_askedToTerminate = true;
110 110
111 if (m_workerThread) 111 if (m_workerThread)
112 m_workerThread->terminateAndWait(); 112 m_workerThread->terminateAndWait();
113 113
114 DCHECK(runningWorkerInstances().contains(this)); 114 DCHECK(runningWorkerInstances().contains(this));
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 *this, *document, *m_workerContextClient); 475 *this, *document, *m_workerContextClient);
476 m_loaderProxy = WorkerLoaderProxy::create(this); 476 m_loaderProxy = WorkerLoaderProxy::create(this);
477 m_workerThread = ServiceWorkerThread::create( 477 m_workerThread = ServiceWorkerThread::create(
478 m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get()); 478 m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get());
479 m_workerThread->start(std::move(startupData)); 479 m_workerThread->start(std::move(startupData));
480 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), 480 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
481 scriptURL); 481 scriptURL);
482 } 482 }
483 483
484 } // namespace blink 484 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebAssociatedURLLoaderImpl.cpp ('k') | third_party/WebKit/Source/web/WebHistoryItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698