Merge WebKit at r67908: Implement new FrameLoaderClient::canShowMIMETypeAsHTML()

See http://trac.webkit.org/changeset/67403

Change-Id: I1407f44baf0b97f3fd8445528b49297a65a0b7bb

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 78a5db8..7f461e2 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -783,6 +783,10 @@ bool FrameLoaderClientAndroid::canShowMIMEType(const String& mimeType) const {
     return false;
 }
 
+bool FrameLoaderClientAndroid::canShowMIMETypeAsHTML(const String& mimeType) const {
+    return false;
+}
+
 bool FrameLoaderClientAndroid::representationExistsForURLScheme(const String&) const {
     // don't use representation
     verifiedOk();

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index 645fcf3..7072818 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -155,6 +155,7 @@ namespace android {
 
         virtual bool canHandleRequest(const ResourceRequest&) const;
         virtual bool canShowMIMEType(const String& MIMEType) const;
+        virtual bool canShowMIMETypeAsHTML(const String& MIMEType) const;
         virtual bool representationExistsForURLScheme(const String& URLScheme) const;
         virtual String generatedMIMETypeForURLScheme(const String& URLScheme) const;