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

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

Issue 1342393002: [Merge to M45] Don't use m_fallbackRequestForServiceWorker in ResourceLoader. (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 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 | Annotate | Revision Log
« 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 OwnPtr<WebURLLoader> m_loader; 104 OwnPtr<WebURLLoader> m_loader;
105 Member<ResourceFetcher> m_fetcher; 105 Member<ResourceFetcher> m_fetcher;
106 106
107 ResourceRequest m_request; 107 ResourceRequest m_request;
108 ResourceRequest m_originalRequest; // Before redirects. 108 ResourceRequest m_originalRequest; // Before redirects.
109 109
110 bool m_notifiedLoadComplete; 110 bool m_notifiedLoadComplete;
111 111
112 bool m_defersLoading; 112 bool m_defersLoading;
113 bool m_loadingMultipartContent; 113 bool m_loadingMultipartContent;
114 OwnPtr<ResourceRequest> m_fallbackRequestForServiceWorker;
115 ResourceRequest m_deferredRequest; 114 ResourceRequest m_deferredRequest;
116 ResourceLoaderOptions m_options; 115 ResourceLoaderOptions m_options;
117 116
118 enum ResourceLoaderState { 117 enum ResourceLoaderState {
119 Initialized, 118 Initialized,
120 Finishing, 119 Finishing,
121 Terminated 120 Terminated
122 }; 121 };
123 122
124 enum ConnectionState { 123 enum ConnectionState {
(...skipping 10 matching lines...) Expand all
135 ResourceLoaderState m_state; 134 ResourceLoaderState m_state;
136 135
137 // Used for sanity checking to make sure we don't experience illegal state 136 // Used for sanity checking to make sure we don't experience illegal state
138 // transitions. 137 // transitions.
139 ConnectionState m_connectionState; 138 ConnectionState m_connectionState;
140 }; 139 };
141 140
142 } 141 }
143 142
144 #endif 143 #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