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

Side by Side Diff: third_party/WebKit/Source/core/fetch/Resource.h

Issue 1444413002: Revert of Simplify starting a navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 bool isEligibleForIntegrityCheck(SecurityOrigin*) const; 192 bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
193 193
194 void clearLoader(); 194 void clearLoader();
195 195
196 SharedBuffer* resourceBuffer() const { return m_data.get(); } 196 SharedBuffer* resourceBuffer() const { return m_data.get(); }
197 void setResourceBuffer(PassRefPtr<SharedBuffer>); 197 void setResourceBuffer(PassRefPtr<SharedBuffer>);
198 198
199 virtual void willFollowRedirect(ResourceRequest&, const ResourceResponse&); 199 virtual void willFollowRedirect(ResourceRequest&, const ResourceResponse&);
200 200
201 virtual void updateRequest(const ResourceRequest&) { }
201 virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataCon sumerHandle>); 202 virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataCon sumerHandle>);
202 void setResponse(const ResourceResponse& response) { m_response = response; } 203 void setResponse(const ResourceResponse& response) { m_response = response; }
203 const ResourceResponse& response() const { return m_response; } 204 const ResourceResponse& response() const { return m_response; }
204 205
205 virtual void reportResourceTimingToClients(const ResourceTimingInfo&) { } 206 virtual void reportResourceTimingToClients(const ResourceTimingInfo&) { }
206 207
207 // Sets the serialized metadata retrieved from the platform's cache. 208 // Sets the serialized metadata retrieved from the platform's cache.
208 virtual void setSerializedCachedMetadata(const char*, size_t); 209 virtual void setSerializedCachedMetadata(const char*, size_t);
209 210
210 // This may return nullptr when the resource isn't cacheable. 211 // This may return nullptr when the resource isn't cacheable.
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 void revalidationFailed(); 374 void revalidationFailed();
374 375
375 bool unlock(); 376 bool unlock();
376 377
377 bool hasRightHandleCountApartFromCache(unsigned targetCount) const; 378 bool hasRightHandleCountApartFromCache(unsigned targetCount) const;
378 379
379 void setCachedMetadata(unsigned dataTypeID, const char*, size_t, CachedMetad ataHandler::CacheType); 380 void setCachedMetadata(unsigned dataTypeID, const char*, size_t, CachedMetad ataHandler::CacheType);
380 void clearCachedMetadata(CachedMetadataHandler::CacheType); 381 void clearCachedMetadata(CachedMetadataHandler::CacheType);
381 CachedMetadata* cachedMetadata(unsigned dataTypeID) const; 382 CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
382 383
384 String m_fragmentIdentifierForRequest;
385
383 RefPtr<CachedMetadata> m_cachedMetadata; 386 RefPtr<CachedMetadata> m_cachedMetadata;
384 OwnPtrWillBeMember<CacheHandler> m_cacheHandler; 387 OwnPtrWillBeMember<CacheHandler> m_cacheHandler;
385 388
386 ResourceError m_error; 389 ResourceError m_error;
387 390
388 double m_loadFinishTime; 391 double m_loadFinishTime;
389 392
390 unsigned long m_identifier; 393 unsigned long m_identifier;
391 394
392 size_t m_encodedSize; 395 size_t m_encodedSize;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 const char* ResourceTypeName(Resource::Type); 439 const char* ResourceTypeName(Resource::Type);
437 #endif 440 #endif
438 441
439 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 442 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
440 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \ 443 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \
441 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); } 444 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); }
442 445
443 } 446 }
444 447
445 #endif 448 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/RawResource.cpp ('k') | third_party/WebKit/Source/core/fetch/Resource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698