diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/platform/haiku | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/platform/haiku')
| -rw-r--r-- | Source/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp b/Source/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp index 685827e..3cfddf9 100644 --- a/Source/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp +++ b/Source/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp @@ -31,6 +31,8 @@ #include "PlatformString.h" #include <MimeType.h> +#include <wtf/Assertions.h> +#include <wtf/MainThread.h> #include <wtf/text/CString.h> namespace WebCore { @@ -62,6 +64,8 @@ static const ExtensionMap extensionMap[] = { String MIMETypeRegistry::getMIMETypeForExtension(const String& ext) { + ASSERT(isMainThread()); + String str = ext.lower(); // Try WebCore built-in types. |