webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 15 deletions

diff --git a/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h b/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h
index 14cd87572..8524659aa 100644
--- a/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h
+++ b/Source/WebCore/loader/archive/mhtml/MHTMLArchive.h
@@ -28,8 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MHTMLArchive_h
-#define MHTMLArchive_h
+#pragma once
 
 #if ENABLE(MHTML)
 
@@ -41,27 +40,26 @@ class MHTMLParser;
 class Page;
 class SharedBuffer;
 
-class MHTMLArchive : public Archive {
+class MHTMLArchive final : public Archive {
 public:
-    virtual Type type() const { return MHTML; }
+    static Ref<MHTMLArchive> create();
+    static RefPtr<MHTMLArchive> create(const URL&, SharedBuffer&);
 
-    static PassRefPtr<MHTMLArchive> create();
-    static PassRefPtr<MHTMLArchive> create(const URL&, SharedBuffer*);
-
-    static PassRefPtr<SharedBuffer> generateMHTMLData(Page*);
-    // Binary encoding results in smaller MHTML files but they might not work in other browsers.
-    static PassRefPtr<SharedBuffer> generateMHTMLDataUsingBinaryEncoding(Page*);
+    static RefPtr<SharedBuffer> generateMHTMLData(Page*);
 
     virtual ~MHTMLArchive();
 
 private:
-    static PassRefPtr<SharedBuffer> generateMHTMLData(Page*, bool useBinaryEncoding);
-
     friend class MHTMLParser;
+
     MHTMLArchive();
+
+    bool shouldLoadFromArchiveOnly() const final { return true; }
+    bool shouldOverrideBaseURL() const final { return true; }
+    bool shouldUseMainResourceEncoding() const final { return false; }
+    bool shouldUseMainResourceURL() const final { return false; }
 };
 
-}
+} // namespace WebCore
 
-#endif
-#endif
+#endif // ENABLE(MHTML)