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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
index b2fb5293fa3f03799652ea1c48841a2ee56e71f9..acff95c7d2a19f1852dd5209679097d4c75dbaca 100644
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
@@ -71,7 +71,7 @@
namespace blink {
-WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
+WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, RawPtr<WorkerClients> workerClients)
: m_url(url)
, m_userAgent(userAgent)
, m_v8CacheOptions(V8CacheOptionsDefault)
@@ -103,7 +103,7 @@ WorkerGlobalScope::~WorkerGlobalScope()
void WorkerGlobalScope::applyContentSecurityPolicyFromVector(const Vector<CSPHeaderAndType>& headers)
{
if (!contentSecurityPolicy()) {
- RefPtrWillBeRawPtr<ContentSecurityPolicy> csp = ContentSecurityPolicy::create();
+ RawPtr<ContentSecurityPolicy> csp = ContentSecurityPolicy::create();
setContentSecurityPolicy(csp);
}
for (const auto& policyAndType : headers)
@@ -206,7 +206,7 @@ void WorkerGlobalScope::dispose()
// Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects,
// which become dangling once Heap is destroyed.
for (auto it = m_eventListeners.begin(); it != m_eventListeners.end(); ) {
- RefPtrWillBeRawPtr<V8AbstractEventListener> listener = *it;
+ RawPtr<V8AbstractEventListener> listener = *it;
// clearListenerObject() will unregister the listener from
// m_eventListeners, and invalidate the iterator, so we have to advance
// it first.
@@ -266,9 +266,9 @@ void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
InspectorInstrumentation::scriptImported(&executionContext, scriptLoader->identifier(), scriptLoader->script());
scriptLoaded(scriptLoader->script().length(), scriptLoader->cachedMetadata() ? scriptLoader->cachedMetadata()->size() : 0);
- RefPtrWillBeRawPtr<ErrorEvent> errorEvent = nullptr;
+ RawPtr<ErrorEvent> errorEvent = nullptr;
OwnPtr<Vector<char>> cachedMetaData(scriptLoader->releaseCachedMetadata());
- OwnPtrWillBeRawPtr<CachedMetadataHandler> handler(createWorkerScriptCachedMetadataHandler(completeURL, cachedMetaData.get()));
+ RawPtr<CachedMetadataHandler> handler(createWorkerScriptCachedMetadataHandler(completeURL, cachedMetaData.get()));
m_scriptController->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader->responseURL()), &errorEvent, handler.get(), m_v8CacheOptions);
if (errorEvent) {
m_scriptController->rethrowExceptionFromImportedScript(errorEvent.release(), exceptionState);
@@ -285,7 +285,7 @@ EventTarget* WorkerGlobalScope::errorEventTarget()
void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> callStack)
{
unsigned long exceptionId = ++m_workerExceptionUniqueIdentifier;
- RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber);
+ RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber);
consoleMessage->setCallStack(callStack);
m_pendingMessages.set(exceptionId, consoleMessage);
@@ -297,15 +297,15 @@ void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& di
InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
}
-void WorkerGlobalScope::addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleMessage)
+void WorkerGlobalScope::addConsoleMessage(RawPtr<ConsoleMessage> prpConsoleMessage)
{
ASSERT(isContextThread());
- RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
+ RawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
thread()->workerReportingProxy().reportConsoleMessage(consoleMessage);
addMessageToWorkerConsole(consoleMessage.release());
}
-void WorkerGlobalScope::addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleMessage)
+void WorkerGlobalScope::addMessageToWorkerConsole(RawPtr<ConsoleMessage> consoleMessage)
{
ASSERT(isContextThread());
m_messageStorage->reportMessage(this, consoleMessage);
@@ -366,7 +366,7 @@ ConsoleMessageStorage* WorkerGlobalScope::messageStorage()
void WorkerGlobalScope::exceptionHandled(int exceptionId, bool isHandled)
{
- RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = m_pendingMessages.take(exceptionId);
+ RawPtr<ConsoleMessage> consoleMessage = m_pendingMessages.take(exceptionId);
if (!isHandled)
addConsoleMessage(consoleMessage.release());
}

Powered by Google App Engine
This is Rietveld 408576698