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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index ab016f4d0aea8ab12f312243f608522407321b1a..09b31fa947569a6d0a3b0abe9573ed86ee2d996d 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -159,7 +159,7 @@ const KURL& DocumentLoader::url() const
Resource* DocumentLoader::startPreload(Resource::Type type, FetchRequest& request)
{
- RefPtrWillBeRawPtr<Resource> resource = nullptr;
+ RawPtr<Resource> resource = nullptr;
switch (type) {
case Resource::Image:
resource = ImageResource::fetch(request, fetcher());
@@ -242,8 +242,8 @@ void DocumentLoader::mainReceivedError(const ResourceError& error)
// but not loads initiated by child frames' data sources -- that's the WebFrame's job.
void DocumentLoader::stopLoading()
{
- RefPtrWillBeRawPtr<LocalFrame> protectFrame(m_frame.get());
- RefPtrWillBeRawPtr<DocumentLoader> protectLoader(this);
+ RawPtr<LocalFrame> protectFrame(m_frame.get());
+ RawPtr<DocumentLoader> protectLoader(this);
if (isLoading())
cancelMainResourceLoad(ResourceError::cancelledError(m_request.url()));
@@ -271,7 +271,7 @@ void DocumentLoader::notifyFinished(Resource* resource)
ASSERT_UNUSED(resource, m_mainResource == resource);
ASSERT(m_mainResource);
- RefPtrWillBeRawPtr<DocumentLoader> protect(this);
+ RawPtr<DocumentLoader> protect(this);
if (!m_mainResource->errorOccurred() && !m_mainResource->wasCanceled()) {
finishedLoading(m_mainResource->loadFinishTime());
@@ -285,7 +285,7 @@ void DocumentLoader::finishedLoading(double finishTime)
{
ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading() || InspectorInstrumentation::isDebuggerPaused(m_frame));
- RefPtrWillBeRawPtr<DocumentLoader> protect(this);
+ RawPtr<DocumentLoader> protect(this);
double responseEndTime = finishTime;
if (!responseEndTime)
@@ -393,7 +393,7 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse
{
ASSERT_UNUSED(resource, m_mainResource == resource);
ASSERT_UNUSED(handle, !handle);
- RefPtrWillBeRawPtr<DocumentLoader> protect(this);
+ RawPtr<DocumentLoader> protect(this);
ASSERT(frame());
m_applicationCacheHost->didReceiveResponseForMainResource(response);
@@ -419,7 +419,7 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse
String content = it->value;
if (frameLoader()->shouldInterruptLoadForXFrameOptions(content, response.url(), mainResourceIdentifier())) {
String message = "Refused to display '" + response.url().elidedString() + "' in a frame because it set 'X-Frame-Options' to '" + content + "'.";
- RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message);
+ RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message);
consoleMessage->setRequestIdentifier(mainResourceIdentifier());
frame()->document()->addConsoleMessage(consoleMessage.release());
@@ -519,8 +519,8 @@ void DocumentLoader::dataReceived(Resource* resource, const char* data, size_t l
// Both unloading the old page and parsing the new page may execute JavaScript which destroys the datasource
// by starting a new load, so retain temporarily.
- RefPtrWillBeRawPtr<LocalFrame> protectFrame(m_frame.get());
- RefPtrWillBeRawPtr<DocumentLoader> protectLoader(this);
+ RawPtr<LocalFrame> protectFrame(m_frame.get());
+ RawPtr<DocumentLoader> protectLoader(this);
TemporaryChange<bool> reentrancyProtector(m_inDataReceived, true);
processData(data, length);
@@ -574,8 +574,8 @@ bool DocumentLoader::loadingMultipartContent() const
void DocumentLoader::detachFromFrame()
{
ASSERT(m_frame);
- RefPtrWillBeRawPtr<LocalFrame> protectFrame(m_frame.get());
- RefPtrWillBeRawPtr<DocumentLoader> protectLoader(this);
+ RawPtr<LocalFrame> protectFrame(m_frame.get());
+ RawPtr<DocumentLoader> protectLoader(this);
// It never makes sense to have a document loader that is detached from its
// frame have any loads active, so go ahead and kill all the loads.
@@ -660,7 +660,7 @@ bool DocumentLoader::maybeLoadEmpty()
void DocumentLoader::startLoadingMainResource()
{
- RefPtrWillBeRawPtr<DocumentLoader> protect(this);
+ RawPtr<DocumentLoader> protect(this);
timing().markNavigationStart();
ASSERT(!m_mainResource);
ASSERT(m_state == NotStarted);
@@ -705,7 +705,7 @@ void DocumentLoader::startLoadingMainResource()
void DocumentLoader::cancelMainResourceLoad(const ResourceError& resourceError)
{
- RefPtrWillBeRawPtr<DocumentLoader> protect(this);
+ RawPtr<DocumentLoader> protect(this);
ResourceError error = resourceError.isNull() ? ResourceError::cancelledError(m_request.url()) : resourceError;
if (mainResourceLoader())
@@ -714,7 +714,7 @@ void DocumentLoader::cancelMainResourceLoad(const ResourceError& resourceError)
mainReceivedError(error);
}
-void DocumentLoader::attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> threadedDataReceiver)
+void DocumentLoader::attachThreadedDataReceiver(RawPtr<ThreadedDataReceiver> threadedDataReceiver)
{
if (mainResourceLoader())
mainResourceLoader()->attachThreadedDataReceiver(threadedDataReceiver);
@@ -732,7 +732,7 @@ void DocumentLoader::endWriting(DocumentWriter* writer)
m_writer.clear();
}
-PassRefPtrWillBeRawPtr<DocumentWriter> DocumentLoader::createWriterFor(const Document* ownerDocument, const DocumentInit& init, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy parsingPolicy)
+RawPtr<DocumentWriter> DocumentLoader::createWriterFor(const Document* ownerDocument, const DocumentInit& init, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy parsingPolicy)
{
LocalFrame* frame = init.frame();
@@ -742,7 +742,7 @@ PassRefPtrWillBeRawPtr<DocumentWriter> DocumentLoader::createWriterFor(const Doc
if (!init.shouldReuseDefaultView())
frame->setDOMWindow(LocalDOMWindow::create(*frame));
- RefPtrWillBeRawPtr<Document> document = frame->localDOMWindow()->installNewDocument(mimeType, init);
+ RawPtr<Document> document = frame->localDOMWindow()->installNewDocument(mimeType, init);
if (ownerDocument) {
document->setCookieURL(ownerDocument->cookieURL());
document->setSecurityOrigin(ownerDocument->securityOrigin());

Powered by Google App Engine
This is Rietveld 408576698