The registration of schemes is currently racey as they are not registered from the...

Getting rid of the assert that ensures that we are registering from the main thread until we can fix this.

Thank you ap@webkit for helping us identify this.

https://bugs.webkit.org/show_bug.cgi?id=77160

Reviewed by Adam Barth.

* platform/SchemeRegistry.cpp:
(WebCore::CORSEnabledSchemes):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 47cd87c..85d21db 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-26  Cris Neckar  <cdn@chromium.org>
+
+        The registration of schemes is currently racey as they are not registered from the main thread. 
+        Getting rid of the assert that ensures that we are registering from the main thread until we can fix this.
+
+        Thank you ap@webkit for helping us identify this.
+
+        https://bugs.webkit.org/show_bug.cgi?id=77160
+
+        Reviewed by Adam Barth.
+
+        * platform/SchemeRegistry.cpp:
+        (WebCore::CORSEnabledSchemes):
+
 2012-01-26  Anders Carlsson  <andersca@apple.com>
 
         We don't need to always repaint overlay scrollbars if they're in layers

diff --git a/Source/WebCore/platform/SchemeRegistry.cpp b/Source/WebCore/platform/SchemeRegistry.cpp
index 40b43b3..d5d36f1 100644 (file)
--- a/Source/WebCore/platform/SchemeRegistry.cpp
+++ b/Source/WebCore/platform/SchemeRegistry.cpp
@@ -155,7 +155,7 @@ static URLSchemesMap& schemesAllowingDatabaseAccessInPrivateBrowsing()
 
 static URLSchemesMap& CORSEnabledSchemes()
 {
-    ASSERT(isMainThread());
+    // FIXME: http://bugs.webkit.org/show_bug.cgi?id=77160  
     DEFINE_STATIC_LOCAL(URLSchemesMap, CORSEnabledSchemes, ());
 
     if (CORSEnabledSchemes.isEmpty()) {