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

Side by Side Diff: Source/core/fetch/ResourceLoader.h

Issue 1284383003: Don't use m_fallbackRequestForServiceWorker in ResourceLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | Source/core/fetch/ResourceLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 OwnPtr<WebURLLoader> m_loader; 105 OwnPtr<WebURLLoader> m_loader;
106 Member<ResourceFetcher> m_fetcher; 106 Member<ResourceFetcher> m_fetcher;
107 107
108 ResourceRequest m_request; 108 ResourceRequest m_request;
109 ResourceRequest m_originalRequest; // Before redirects. 109 ResourceRequest m_originalRequest; // Before redirects.
110 110
111 bool m_notifiedLoadComplete; 111 bool m_notifiedLoadComplete;
112 112
113 bool m_defersLoading; 113 bool m_defersLoading;
114 bool m_loadingMultipartContent; 114 bool m_loadingMultipartContent;
115 OwnPtr<ResourceRequest> m_fallbackRequestForServiceWorker;
116 ResourceRequest m_deferredRequest; 115 ResourceRequest m_deferredRequest;
117 ResourceLoaderOptions m_options; 116 ResourceLoaderOptions m_options;
118 117
119 enum ResourceLoaderState { 118 enum ResourceLoaderState {
120 Initialized, 119 Initialized,
121 Finishing, 120 Finishing,
122 Terminated 121 Terminated
123 }; 122 };
124 123
125 enum ConnectionState { 124 enum ConnectionState {
(...skipping 10 matching lines...) Expand all
136 ResourceLoaderState m_state; 135 ResourceLoaderState m_state;
137 136
138 // Used for sanity checking to make sure we don't experience illegal state 137 // Used for sanity checking to make sure we don't experience illegal state
139 // transitions. 138 // transitions.
140 ConnectionState m_connectionState; 139 ConnectionState m_connectionState;
141 }; 140 };
142 141
143 } 142 }
144 143
145 #endif 144 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/fetch/ResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698