webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 19 insertions, 19 deletions

diff --git a/Source/WebCore/loader/archive/ArchiveResourceCollection.h b/Source/WebCore/loader/archive/ArchiveResourceCollection.h
index 1927a8952..37df68b36 100644
--- a/Source/WebCore/loader/archive/ArchiveResourceCollection.h
+++ b/Source/WebCore/loader/archive/ArchiveResourceCollection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -26,35 +26,35 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ArchiveResourceCollection_h
-#define ArchiveResourceCollection_h
-
-#include "Archive.h"
-#include "ArchiveResource.h"
-#include "URL.h"
-#include <wtf/text/WTFString.h>
+#pragma once
 
+#include <wtf/Forward.h>
 #include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/text/StringHash.h>
 
 namespace WebCore {
 
+class Archive;
+class ArchiveResource;
+class URL;
+
 class ArchiveResourceCollection {
-    WTF_MAKE_NONCOPYABLE(ArchiveResourceCollection); WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_NONCOPYABLE(ArchiveResourceCollection);
+    WTF_MAKE_FAST_ALLOCATED;
+
 public:
-    ArchiveResourceCollection();
+    ArchiveResourceCollection() = default;
 
-    void addResource(PassRefPtr<ArchiveResource>);
-    void addAllResources(Archive*);
+    void addResource(Ref<ArchiveResource>&&);
+    void addAllResources(Archive&);
     
-    ArchiveResource* archiveResourceForURL(const URL&);
-    PassRefPtr<Archive> popSubframeArchive(const String& frameName, const URL&);
+    WEBCORE_EXPORT ArchiveResource* archiveResourceForURL(const URL&);
+    RefPtr<Archive> popSubframeArchive(const String& frameName, const URL&);
     
 private:    
     HashMap<String, RefPtr<ArchiveResource>> m_subresources;
     HashMap<String, RefPtr<Archive>> m_subframes;
 };
 
-}
-
-#endif
+} // namespace WebCore