Index: Source/core/fetch/ResourceFetcher.h |
diff --git a/Source/core/fetch/ResourceFetcher.h b/Source/core/fetch/ResourceFetcher.h |
index 3682772ec5e59148595c58a9d47188fa693fa3d6..1967d751d3d0598c70c049f4d309ae163331fb0e 100644 |
--- a/Source/core/fetch/ResourceFetcher.h |
+++ b/Source/core/fetch/ResourceFetcher.h |
@@ -35,7 +35,6 @@ |
#include "core/fetch/ResourceLoaderOptions.h" |
#include "core/fetch/ResourcePtr.h" |
#include "platform/Timer.h" |
-#include "wtf/Deque.h" |
#include "wtf/HashMap.h" |
#include "wtf/HashSet.h" |
#include "wtf/ListHashSet.h" |
@@ -72,9 +71,6 @@ class ResourceLoaderSet; |
class ResourceFetcher final : public RefCountedWillBeGarbageCollectedFinalized<ResourceFetcher>, public ResourceLoaderHost { |
WTF_MAKE_NONCOPYABLE(ResourceFetcher); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ResourceFetcher); |
-friend class ImageLoader; |
-friend class ResourceCacheValidationSuppressor; |
- |
public: |
static PassRefPtrWillBeRawPtr<ResourceFetcher> create(PassOwnPtrWillBeRawPtr<FetchContext> context) { return adoptRefWillBeNoop(new ResourceFetcher(context)); } |
virtual ~ResourceFetcher(); |
@@ -178,6 +174,8 @@ public: |
static ResourceFetcher* toResourceFetcher(ResourceLoaderHost*); |
private: |
+ friend class ImageLoader; |
+ friend class ResourceCacheValidationSuppressor; |
friend class ResourceFetcherUpgradeTest; |
friend class ResourceFetcherHintsTest; |
@@ -259,7 +257,7 @@ private: |
class ResourceCacheValidationSuppressor { |
WTF_MAKE_NONCOPYABLE(ResourceCacheValidationSuppressor); |
- WTF_MAKE_FAST_ALLOCATED; |
+ STACK_ALLOCATED(); |
public: |
ResourceCacheValidationSuppressor(ResourceFetcher* loader) |
: m_loader(loader) |
@@ -276,10 +274,10 @@ public: |
m_loader->m_allowStaleResources = m_previousState; |
} |
private: |
- ResourceFetcher* m_loader; |
+ RawPtrWillBeMember<ResourceFetcher> m_loader; |
bool m_previousState; |
}; |
} // namespace blink |
-#endif |
+#endif // ResourceFetcher_h |