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

Side by Side Diff: Source/core/fetch/Resource.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/dom/ProcessingInstruction.cpp ('k') | Source/core/fetch/Resource.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) 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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
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 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 return type() == MainResource 168 return type() == MainResource
169 || type() == LinkPrefetch 169 || type() == LinkPrefetch
170 || type() == LinkSubresource 170 || type() == LinkSubresource
171 || type() == Media 171 || type() == Media
172 || type() == Raw 172 || type() == Raw
173 || type() == TextTrack; 173 || type() == TextTrack;
174 } 174 }
175 175
176 // Computes the status of an object after loading. 176 // Computes the status of an object after loading.
177 // Updates the expire date on the cache entry file 177 // Updates the expire date on the cache entry file
178 void setLoadFinishTime(double finishTime) { m_loadFinishTime = finishTime; } 178 void finish(double finishTime = 0.0);
179 void finish();
180 179
181 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated. 180 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated.
182 bool passesAccessControlCheck(SecurityOrigin*); 181 bool passesAccessControlCheck(SecurityOrigin*);
183 bool passesAccessControlCheck(SecurityOrigin*, String& errorDescription); 182 bool passesAccessControlCheck(SecurityOrigin*, String& errorDescription);
184 183
185 void clearLoader(); 184 void clearLoader();
186 185
187 SharedBuffer* resourceBuffer() const { return m_data.get(); } 186 SharedBuffer* resourceBuffer() const { return m_data.get(); }
188 void setResourceBuffer(PassRefPtr<SharedBuffer>); 187 void setResourceBuffer(PassRefPtr<SharedBuffer>);
189 188
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 const char* ResourceTypeName(Resource::Type); 415 const char* ResourceTypeName(Resource::Type);
417 #endif 416 #endif
418 417
419 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 418 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
420 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \ 419 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \
421 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); } 420 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); }
422 421
423 } 422 }
424 423
425 #endif 424 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/ProcessingInstruction.cpp ('k') | Source/core/fetch/Resource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698