Title: [148078] trunk/Source/WebKit2
- Revision
- 148078
- Author
- grao...@apple.com
- Date
- 2013-04-09 23:45:02 -0700 (Tue, 09 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (148077 => 148078)
--- trunk/Source/WebKit2/ChangeLog 2013-04-10 05:21:09 UTC (rev 148077)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-10 06:45:02 UTC (rev 148078)
@@ -1,3 +1,16 @@
+2013-04-09 Antoine Quint <grao...@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 <ander...@apple.com>
REGRESSION (r147454): Youtube annotation links to new window broken
Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (148077 => 148078)
--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-04-10 05:21:09 UTC (rev 148077)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-04-10 06:45:02 UTC (rev 148078)
@@ -115,8 +115,7 @@
bool WebFrameProxy::isDisplayingMarkupDocument() const
{
// 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);
}
bool WebFrameProxy::isDisplayingPDFDocument() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
