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

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

Issue 2390583002: [WIP] WebFonts cache-aware timeout adaption (Closed)
Patch Set: handle case in RemoteFontFaceSource if cache-aware deactivated in startLoad(), rebase Created 4 years, 1 month 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 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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 558
559 const ResourceRequest& Resource::lastResourceRequest() const { 559 const ResourceRequest& Resource::lastResourceRequest() const {
560 if (!m_redirectChain.size()) 560 if (!m_redirectChain.size())
561 return m_resourceRequest; 561 return m_resourceRequest;
562 return m_redirectChain.last().m_request; 562 return m_redirectChain.last().m_request;
563 } 563 }
564 564
565 void Resource::setRevalidatingRequest(const ResourceRequest& request) { 565 void Resource::setRevalidatingRequest(const ResourceRequest& request) {
566 SECURITY_CHECK(m_redirectChain.isEmpty()); 566 SECURITY_CHECK(m_redirectChain.isEmpty());
567 DCHECK(!request.isNull()); 567 DCHECK(!request.isNull());
568 DCHECK(!request.isCacheAwareLoadingActivated());
568 m_isRevalidating = true; 569 m_isRevalidating = true;
569 m_resourceRequest = request; 570 m_resourceRequest = request;
570 m_status = NotStarted; 571 m_status = NotStarted;
571 } 572 }
572 573
573 bool Resource::willFollowRedirect(const ResourceRequest& newRequest, 574 bool Resource::willFollowRedirect(const ResourceRequest& newRequest,
574 const ResourceResponse& redirectResponse) { 575 const ResourceResponse& redirectResponse) {
575 if (m_isRevalidating) 576 if (m_isRevalidating)
576 revalidationFailed(); 577 revalidationFailed();
577 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); 578 m_redirectChain.append(RedirectPair(newRequest, redirectResponse));
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 case Resource::TextTrack: 1099 case Resource::TextTrack:
1099 case Resource::Media: 1100 case Resource::Media:
1100 case Resource::Manifest: 1101 case Resource::Manifest:
1101 return false; 1102 return false;
1102 } 1103 }
1103 NOTREACHED(); 1104 NOTREACHED();
1104 return false; 1105 return false;
1105 } 1106 }
1106 1107
1107 } // namespace blink 1108 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698