Substitute ArchiveFactory::isArchiveMIMEType() for ArchiveFactory::isArchiveMimeType().
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2018 21:53:35 +0000 (21:53 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2018 21:53:35 +0000 (21:53 +0000)
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::commitLoad):
* loader/archive/ArchiveFactory.cpp:
(WebCore::ArchiveFactory::isArchiveMIMEType):
(WebCore::ArchiveFactory::isArchiveMimeType): Deleted.
* loader/archive/ArchiveFactory.h:
* platform/MIMETypeRegistry.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@230083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/loader/archive/ArchiveFactory.cpp
Source/WebCore/loader/archive/ArchiveFactory.h

index 73111d9..d26a40f 100644 (file)
@@ -1,5 +1,17 @@
 2018-03-29  Daniel Bates  <dabates@apple.com>
 
+        Substitute ArchiveFactory::isArchiveMIMEType() for ArchiveFactory::isArchiveMimeType().
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::commitLoad):
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::ArchiveFactory::isArchiveMIMEType):
+        (WebCore::ArchiveFactory::isArchiveMimeType): Deleted.
+        * loader/archive/ArchiveFactory.h:
+        * platform/MIMETypeRegistry.h:
+
+2018-03-29  Daniel Bates  <dabates@apple.com>
+
         MIMETypeRegistry should return const HashSets
         https://bugs.webkit.org/show_bug.cgi?id=184150
 
index cf9ef2d..bc992b0 100644 (file)
@@ -941,7 +941,7 @@ void DocumentLoader::commitLoad(const char* data, int length)
     if (!frameLoader)
         return;
 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
-    if (ArchiveFactory::isArchiveMimeType(response().mimeType()))
+    if (ArchiveFactory::isArchiveMIMEType(response().mimeType()))
         return;
 #endif
     frameLoader->client().committedLoad(this, data, length);
index 417ac47..bee6e9e 100644 (file)
@@ -78,7 +78,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
     return map;
 }
 
-bool ArchiveFactory::isArchiveMimeType(const String& mimeType)
+bool ArchiveFactory::isArchiveMIMEType(const String& mimeType)
 {
     return !mimeType.isEmpty() && archiveMIMETypes().contains(mimeType);
 }
index f37b3c5..510e519 100644 (file)
@@ -38,7 +38,7 @@ class SharedBuffer;
 
 class ArchiveFactory {
 public:
-    static bool isArchiveMimeType(const String&);
+    static bool isArchiveMIMEType(const String&);
     static RefPtr<Archive> create(const URL&, SharedBuffer* data, const String& mimeType);
     static void registerKnownArchiveMIMETypes();
 };