diff options
Diffstat (limited to 'Source/WebCore/platform/android/TemporaryLinkStubs.cpp')
| -rw-r--r-- | Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index d3c8183..cf15462 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -76,6 +76,8 @@ #include "Widget.h" #include <stdio.h> #include <stdlib.h> +#include <wtf/Assertions.h> +#include <wtf/MainThread.h> #include <wtf/text/CString.h> #if USE(JSC) @@ -296,6 +298,16 @@ void* WebCore::Frame::dragImageForSelection() return 0; } +<<<<<<< HEAD +======= + +WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) +{ + ASSERT(isMainThread()); + return WTF::String(); +} + +>>>>>>> webkit.org at r78450 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} namespace WebCore { |