summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-29 01:12:13 +0100
committerSteve Block <steveblock@google.com>2010-05-11 14:42:14 +0100
commit1a0295103dca085437f7f17d26f2037e54c51cb5 (patch)
tree879a07403126267d3366441330be1e5aa3ab300c /WebKit
parent0a06e7e772d95238accdb0139e5069b3e75091b1 (diff)
downloadexternal_webkit-1a0295103dca085437f7f17d26f2037e54c51cb5.zip
external_webkit-1a0295103dca085437f7f17d26f2037e54c51cb5.tar.gz
external_webkit-1a0295103dca085437f7f17d26f2037e54c51cb5.tar.bz2
Merge webkit.org at r58033 : Implement MIMETypeRegistry::isApplicationPluginMIMEType() for Android
See http://trac.webkit.org/changeset/56661 Change-Id: I3f0047c7a4424b9aed928388a24977b1b415267e
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/MIMETypeRegistry.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/jni/MIMETypeRegistry.cpp b/WebKit/android/jni/MIMETypeRegistry.cpp
index 32f387d..5fe9ccd 100644
--- a/WebKit/android/jni/MIMETypeRegistry.cpp
+++ b/WebKit/android/jni/MIMETypeRegistry.cpp
@@ -58,4 +58,9 @@ String MIMETypeRegistry::getMIMETypeForExtension(const String& ext)
return result;
}
+bool MIMETypeRegistry::isApplicationPluginMIMEType(const String&)
+{
+ return false;
+}
+
}