OLD | NEW |
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 | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
7 rights reserved. | 7 rights reserved. |
8 | 8 |
9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 } | 542 } |
543 | 543 |
544 void Resource::setRevalidatingRequest(const ResourceRequest& request) { | 544 void Resource::setRevalidatingRequest(const ResourceRequest& request) { |
545 SECURITY_CHECK(m_redirectChain.isEmpty()); | 545 SECURITY_CHECK(m_redirectChain.isEmpty()); |
546 DCHECK(!request.isNull()); | 546 DCHECK(!request.isNull()); |
547 m_isRevalidating = true; | 547 m_isRevalidating = true; |
548 m_resourceRequest = request; | 548 m_resourceRequest = request; |
549 m_status = NotStarted; | 549 m_status = NotStarted; |
550 } | 550 } |
551 | 551 |
552 void Resource::willFollowRedirect(ResourceRequest& newRequest, | 552 bool Resource::willFollowRedirect(const ResourceRequest& newRequest, |
553 const ResourceResponse& redirectResponse) { | 553 const ResourceResponse& redirectResponse) { |
554 if (m_isRevalidating) | 554 if (m_isRevalidating) |
555 revalidationFailed(); | 555 revalidationFailed(); |
556 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); | 556 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); |
| 557 return true; |
557 } | 558 } |
558 | 559 |
559 void Resource::setResponse(const ResourceResponse& response) { | 560 void Resource::setResponse(const ResourceResponse& response) { |
560 m_response = response; | 561 m_response = response; |
561 if (m_response.wasFetchedViaServiceWorker()) | 562 if (m_response.wasFetchedViaServiceWorker()) |
562 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create( | 563 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create( |
563 this, m_fetcherSecurityOrigin.get()); | 564 this, m_fetcherSecurityOrigin.get()); |
564 } | 565 } |
565 | 566 |
566 void Resource::responseReceived(const ResourceResponse& response, | 567 void Resource::responseReceived(const ResourceResponse& response, |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1074 case Resource::TextTrack: | 1075 case Resource::TextTrack: |
1075 case Resource::Media: | 1076 case Resource::Media: |
1076 case Resource::Manifest: | 1077 case Resource::Manifest: |
1077 return false; | 1078 return false; |
1078 } | 1079 } |
1079 NOTREACHED(); | 1080 NOTREACHED(); |
1080 return false; | 1081 return false; |
1081 } | 1082 } |
1082 | 1083 |
1083 } // namespace blink | 1084 } // namespace blink |
OLD | NEW |