From 2fc2651226baac27029e38c9d6ef883fa32084db Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 13:36:51 +0100
Subject: Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
---
 Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp')

diff --git a/Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp b/Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp
index e7cc0e2..94a815e 100644
--- a/Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp
+++ b/Source/WebCore/platform/wx/MimeTypeRegistryWx.cpp
@@ -28,6 +28,9 @@
 #include "config.h"
 #include "MIMETypeRegistry.h"
 
+#include <wtf/Assertions.h>
+#include <wtf/MainThread.h>
+
 namespace WebCore {
 
 struct ExtensionMap {
@@ -59,6 +62,8 @@ static const ExtensionMap extensionMap [] = {
     
 String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
+    ASSERT(isMainThread());
+
     String s = ext.lower();
     const ExtensionMap *e = extensionMap;
     while (e->extension) {
-- 
cgit v1.1