Changeset 148078 in webkit

Timestamp:

Apr 9, 2013 11:45:02 PM (11 years ago)

Author:

Antoine Quint

Message:

WKFrameIsDisplayingMarkupDocument should return true for Web Archives
​https://bugs.webkit.org/show_bug.cgi?id=114291

Reviewed by Dean Jackson.

Also return true for the Web Archive MIME type since a Web Archive
is displaying a markup document by nature.

• UIProcess/WebFrameProxy.cpp:

(WebKit::WebFrameProxy::isDisplayingMarkupDocument):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebFrameProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-09  Antoine Quint  <graouts@apple.com>
+
+        WKFrameIsDisplayingMarkupDocument should return true for Web Archives
+        https://bugs.webkit.org/show_bug.cgi?id=114291
+
+        Reviewed by Dean Jackson.
+
+        Also return true for the Web Archive MIME type since a Web Archive
+        is displaying a markup document by nature.
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::isDisplayingMarkupDocument):
+
 2013-04-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp

@@ -116 +116 @@
 {
     // FIXME: This check should be moved to somewhere in WebCore.
-    // FIXME: This returns false when displaying a web archive.
-    return m_MIMEType == "text/html" || m_MIMEType == "image/svg+xml" || DOMImplementation::isXMLMIMEType(m_MIMEType);
+    return m_MIMEType == "text/html" || m_MIMEType == "image/svg+xml" || m_MIMEType == "application/x-webarchive" || DOMImplementation::isXMLMIMEType(m_MIMEType);
 }