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

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

Issue 2343053002: Service worker bypass for resource requests from suborigins (Closed)
Patch Set: Update to handle MemCache 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 { 1025 {
1026 DCHECK(resource && resource->stillNeedsLoad()); 1026 DCHECK(resource && resource->stillNeedsLoad());
1027 if (!context().shouldLoadNewResource(resource->getType())) { 1027 if (!context().shouldLoadNewResource(resource->getType())) {
1028 memoryCache()->remove(resource); 1028 memoryCache()->remove(resource);
1029 return false; 1029 return false;
1030 } 1030 }
1031 1031
1032 ResourceRequest request(resource->resourceRequest()); 1032 ResourceRequest request(resource->resourceRequest());
1033 willSendRequest(resource->identifier(), request, ResourceResponse(), resourc e->options()); 1033 willSendRequest(resource->identifier(), request, ResourceResponse(), resourc e->options());
1034 1034
1035 SecurityOrigin* sourceOrigin = context().getSecurityOrigin();
1036 if (sourceOrigin && sourceOrigin->hasSuborigin())
1037 request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
falken 2016/09/20 03:48:57 I know this is Blink but can we comment here why s
jww 2016/09/20 04:27:47 Hahaha, I like you're style :-) I always get ticke
1038
1035 ResourceLoader* loader = ResourceLoader::create(this, resource); 1039 ResourceLoader* loader = ResourceLoader::create(this, resource);
1036 if (resource->shouldBlockLoadEvent()) 1040 if (resource->shouldBlockLoadEvent())
1037 m_loaders.add(loader); 1041 m_loaders.add(loader);
1038 else 1042 else
1039 m_nonBlockingLoaders.add(loader); 1043 m_nonBlockingLoaders.add(loader);
1040 1044
1041 storeResourceTimingInitiatorInformation(resource); 1045 storeResourceTimingInitiatorInformation(resource);
1042 resource->setFetcherSecurityOrigin(context().getSecurityOrigin()); 1046 resource->setFetcherSecurityOrigin(sourceOrigin);
1043 loader->start(request, context().loadingTaskRunner(), context().defersLoadin g()); 1047 loader->start(request, context().loadingTaskRunner(), context().defersLoadin g());
1044 return true; 1048 return true;
1045 } 1049 }
1046 1050
1047 void ResourceFetcher::removeResourceLoader(ResourceLoader* loader) 1051 void ResourceFetcher::removeResourceLoader(ResourceLoader* loader)
1048 { 1052 {
1049 if (m_loaders.contains(loader)) 1053 if (m_loaders.contains(loader))
1050 m_loaders.remove(loader); 1054 m_loaders.remove(loader);
1051 else if (m_nonBlockingLoaders.contains(loader)) 1055 else if (m_nonBlockingLoaders.contains(loader))
1052 m_nonBlockingLoaders.remove(loader); 1056 m_nonBlockingLoaders.remove(loader);
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 visitor->trace(m_context); 1327 visitor->trace(m_context);
1324 visitor->trace(m_archive); 1328 visitor->trace(m_archive);
1325 visitor->trace(m_loaders); 1329 visitor->trace(m_loaders);
1326 visitor->trace(m_nonBlockingLoaders); 1330 visitor->trace(m_nonBlockingLoaders);
1327 visitor->trace(m_documentResources); 1331 visitor->trace(m_documentResources);
1328 visitor->trace(m_preloads); 1332 visitor->trace(m_preloads);
1329 visitor->trace(m_resourceTimingInfoMap); 1333 visitor->trace(m_resourceTimingInfoMap);
1330 } 1334 }
1331 1335
1332 } // namespace blink 1336 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698