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/gtk/MIMETypeRegistryGtk.cpp | |
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/gtk/MIMETypeRegistryGtk.cpp')
-rw-r--r-- | Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp b/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp index 8fc3020..9f7f14c 100644 --- a/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp +++ b/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp @@ -28,6 +28,9 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include <wtf/Assertions.h> +#include <wtf/MainThread.h> + namespace WebCore { struct ExtensionMap { @@ -62,6 +65,8 @@ static const ExtensionMap extensionMap [] = { String MIMETypeRegistry::getMIMETypeForExtension(const String &ext) { + ASSERT(isMainThread()); + String s = ext.lower(); const ExtensionMap *e = extensionMap; while (e->extension) { |