summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-01-13 11:51:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-13 11:51:46 -0800
commitccc6dd6b0e8e44376d1240aa859eda1919cdd095 (patch)
treeef57c498cd55890dade61713034ce9eec0f11110 /WebCore
parent3bbaa0e0bda36b5a555a55d744d8f1b287b1df37 (diff)
parente4771f1b95589eff8479702dfbf5ef03c267c5c3 (diff)
downloadexternal_webkit-ccc6dd6b0e8e44376d1240aa859eda1919cdd095.zip
external_webkit-ccc6dd6b0e8e44376d1240aa859eda1919cdd095.tar.gz
external_webkit-ccc6dd6b0e8e44376d1240aa859eda1919cdd095.tar.bz2
am e4771f1b: am 6916255e: Call into MimeTypeMap to get the mime type for an extension.
Merge commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3' * commit 'e4771f1b95589eff8479702dfbf5ef03c267c5c3': Call into MimeTypeMap to get the mime type for an extension.
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/android/TemporaryLinkStubs.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 3e71689..fb9293c 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -60,7 +60,6 @@
#include "KURL.h"
#include "Language.h"
#include "LocalizedStrings.h"
-#include "MIMETypeRegistry.h"
#include "MainResourceLoader.h"
#include "Node.h"
#include "NotImplemented.h"
@@ -354,12 +353,6 @@ void* WebCore::Frame::dragImageForSelection()
return 0;
}
-
-WebCore::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WebCore::String const&)
-{
- return WebCore::String();
-}
-
void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WebCore::String const&) {}
namespace WebCore {