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

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

Issue 679863002: Revert "Prepare blink to unify definitions of load completion" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 private: 101 private:
102 ResourceLoader(ResourceLoaderHost*, Resource*, const ResourceLoaderOptions&) ; 102 ResourceLoader(ResourceLoaderHost*, Resource*, const ResourceLoaderOptions&) ;
103 103
104 void init(const ResourceRequest&); 104 void init(const ResourceRequest&);
105 void requestSynchronously(); 105 void requestSynchronously();
106 106
107 void didFinishLoadingOnePart(double finishTime, int64_t encodedDataLength); 107 void didFinishLoadingOnePart(double finishTime, int64_t encodedDataLength);
108 108
109 bool responseNeedsAccessControlCheck() const; 109 bool responseNeedsAccessControlCheck() const;
110 110
111 void didComplete();
112
113 ResourceRequest& applyOptions(ResourceRequest&) const; 111 ResourceRequest& applyOptions(ResourceRequest&) const;
114 112
115 OwnPtr<blink::WebURLLoader> m_loader; 113 OwnPtr<blink::WebURLLoader> m_loader;
116 RefPtrWillBeMember<ResourceLoaderHost> m_host; 114 RefPtrWillBeMember<ResourceLoaderHost> m_host;
117 115
118 ResourceRequest m_request; 116 ResourceRequest m_request;
119 ResourceRequest m_originalRequest; // Before redirects. 117 ResourceRequest m_originalRequest; // Before redirects.
120 118
121 bool m_notifiedLoadComplete; 119 bool m_notifiedLoadComplete;
122 120
(...skipping 24 matching lines...) Expand all
147 // Used for sanity checking to make sure we don't experience illegal state 145 // Used for sanity checking to make sure we don't experience illegal state
148 // transitions. 146 // transitions.
149 ConnectionState m_connectionState; 147 ConnectionState m_connectionState;
150 148
151 OwnPtr<RequestCountTracker> m_requestCountTracker; 149 OwnPtr<RequestCountTracker> m_requestCountTracker;
152 }; 150 };
153 151
154 } 152 }
155 153
156 #endif 154 #endif
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/fetch/ResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698