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

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

Issue 1198963003: [NOCOMMIT] Apply cl/1194003004 on cl/1124153003 PS 10 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 | « Source/core/fetch/MemoryCacheTest.cpp ('k') | Source/core/fetch/ResourceFetcher.h » ('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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 ResourceRequest m_request; 330 ResourceRequest m_request;
331 ResourceResponse m_redirectResponse; 331 ResourceResponse m_redirectResponse;
332 }; 332 };
333 const Vector<RedirectPair>& redirectChain() const { return m_redirectChain; } 333 const Vector<RedirectPair>& redirectChain() const { return m_redirectChain; }
334 334
335 virtual bool isSafeToUnlock() const { return false; } 335 virtual bool isSafeToUnlock() const { return false; }
336 virtual void destroyDecodedDataIfPossible() { } 336 virtual void destroyDecodedDataIfPossible() { }
337 337
338 ResourceRequest m_resourceRequest; 338 ResourceRequest m_resourceRequest;
339 AtomicString m_accept; 339 AtomicString m_accept;
340 RefPtrWillBeMember<ResourceLoader> m_loader; 340 PersistentWillBeMember<ResourceLoader> m_loader;
341 ResourceLoaderOptions m_options; 341 ResourceLoaderOptions m_options;
342 342
343 ResourceResponse m_response; 343 ResourceResponse m_response;
344 double m_responseTimestamp; 344 double m_responseTimestamp;
345 345
346 RefPtr<SharedBuffer> m_data; 346 RefPtr<SharedBuffer> m_data;
347 Timer<Resource> m_cancelTimer; 347 Timer<Resource> m_cancelTimer;
348 348
349 private: 349 private:
350 class CacheHandler; 350 class CacheHandler;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 const char* ResourceTypeName(Resource::Type); 434 const char* ResourceTypeName(Resource::Type);
435 #endif 435 #endif
436 436
437 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 437 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
438 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \ 438 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \
439 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); } 439 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); }
440 440
441 } 441 }
442 442
443 #endif 443 #endif
OLDNEW
« no previous file with comments | « Source/core/fetch/MemoryCacheTest.cpp ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698