webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 9 deletions

diff --git a/Source/WebCore/loader/archive/mhtml/MHTMLParser.h b/Source/WebCore/loader/archive/mhtml/MHTMLParser.h
index 4f1b126bc..1e9bd4d77 100644
--- a/Source/WebCore/loader/archive/mhtml/MHTMLParser.h
+++ b/Source/WebCore/loader/archive/mhtml/MHTMLParser.h
@@ -28,10 +28,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MHTMLParser_h
-#define MHTMLParser_h
+#pragma once
 
 #if ENABLE(MHTML)
+
 #include "SharedBufferChunkReader.h"
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -48,7 +48,7 @@ class MHTMLParser {
 public:
     explicit MHTMLParser(SharedBuffer*);
 
-    PassRefPtr<MHTMLArchive> parseArchive();
+    RefPtr<MHTMLArchive> parseArchive();
 
     size_t frameCount() const;
     MHTMLArchive* frameAt(size_t) const;
@@ -57,8 +57,8 @@ public:
     ArchiveResource* subResourceAt(size_t) const;
 
 private:
-    PassRefPtr<MHTMLArchive> parseArchiveWithHeader(MIMEHeader*);
-    PassRefPtr<ArchiveResource> parseNextPart(const MIMEHeader&, const String& endOfPartBoundary, const String& endOfDocumentBoundary, bool& endOfArchiveReached);
+    RefPtr<MHTMLArchive> parseArchiveWithHeader(MIMEHeader*);
+    RefPtr<ArchiveResource> parseNextPart(const MIMEHeader&, const String& endOfPartBoundary, const String& endOfDocumentBoundary, bool& endOfArchiveReached);
 
     void addResourceToArchive(ArchiveResource*, MHTMLArchive*);
 
@@ -67,8 +67,6 @@ private:
     Vector<RefPtr<MHTMLArchive>> m_frames;
 };
 
-}
-
-#endif
-#endif
+} // namespace WebCore
 
+#endif // ENABLE(MHTML)