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

Side by Side Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 2230173002: Change WebURLLoaderClient::willFollowRedirect() API to return bool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 534
535 void Resource::setRevalidatingRequest(const ResourceRequest& request) 535 void Resource::setRevalidatingRequest(const ResourceRequest& request)
536 { 536 {
537 SECURITY_CHECK(m_redirectChain.isEmpty()); 537 SECURITY_CHECK(m_redirectChain.isEmpty());
538 DCHECK(!request.isNull()); 538 DCHECK(!request.isNull());
539 m_isRevalidating = true; 539 m_isRevalidating = true;
540 m_resourceRequest = request; 540 m_resourceRequest = request;
541 m_status = NotStarted; 541 m_status = NotStarted;
542 } 542 }
543 543
544 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceRes ponse& redirectResponse) 544 bool Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceRes ponse& redirectResponse)
545 { 545 {
546 if (m_isRevalidating) 546 if (m_isRevalidating)
547 revalidationFailed(); 547 revalidationFailed();
548 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); 548 m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
549 return true;
549 } 550 }
550 551
551 void Resource::setResponse(const ResourceResponse& response) 552 void Resource::setResponse(const ResourceResponse& response)
552 { 553 {
553 m_response = response; 554 m_response = response;
554 if (m_response.wasFetchedViaServiceWorker()) 555 if (m_response.wasFetchedViaServiceWorker())
555 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create(this , m_fetcherSecurityOrigin.get()); 556 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create(this , m_fetcherSecurityOrigin.get());
556 } 557 }
557 558
558 void Resource::responseReceived(const ResourceResponse& response, std::unique_pt r<WebDataConsumerHandle>) 559 void Resource::responseReceived(const ResourceResponse& response, std::unique_pt r<WebDataConsumerHandle>)
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 case Resource::TextTrack: 1066 case Resource::TextTrack:
1066 case Resource::Media: 1067 case Resource::Media:
1067 case Resource::Manifest: 1068 case Resource::Manifest:
1068 return false; 1069 return false;
1069 } 1070 }
1070 NOTREACHED(); 1071 NOTREACHED();
1071 return false; 1072 return false;
1072 } 1073 }
1073 1074
1074 } // namespace blink 1075 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698