Changeset 87462 in webkit

Timestamp:

May 26, 2011, 7:16:21 PM (15 years ago)

Author:

levin@chromium.org

Message:

2011-05-26 David Levin <​levin@chromium.org>

Reviewed by Dmitry Titov.

WebKit's font notification has problems when the WebKit main thread != UI thread.
​https://bugs.webkit.org/show_bug.cgi?id=61391

This doesn't happen in DumpRenderTree, so it needs a unit test which is taking me
some time to write correctly. In the meantime, this issues happens to be causing
some crashes in Chrome so here's the fix alone for the time being.

• platform/graphics/mac/FontCacheMac.mm: (WebCore::invalidateFontCache): Ensure that FontCache::invalidate is only called on WebKit's main thread. (WebCore::fontCacheRegisteredFontsChangedNotificationCallback): Call common function for font cache invalidation. Note that the call to fontCache() is fine since the singleton is initialized well before calling this function. Theoretically, there could be a problem due to a lack of a memory barrier but that is highly unlikely and this is debug only code. (WebCore::fontCacheATSNotificationCallback): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/FontCacheMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-26  David Levin  <levin@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        WebKit's font notification has problems when the WebKit main thread != UI thread.
+        https://bugs.webkit.org/show_bug.cgi?id=61391
+
+        This doesn't happen in DumpRenderTree, so it needs a unit test which is taking me
+        some time to write correctly. In the meantime, this issues happens to be causing
+        some crashes in Chrome so here's the fix alone for the time being.
+
+        * platform/graphics/mac/FontCacheMac.mm:
+        (WebCore::invalidateFontCache): Ensure that FontCache::invalidate is only called on WebKit's main thread.
+        (WebCore::fontCacheRegisteredFontsChangedNotificationCallback): Call common function for font cache invalidation.
+         Note that the call to fontCache() is fine since the singleton is initialized well before calling this function. Theoretically,
+         there could be a problem due to a lack of a memory barrier but that is highly unlikely and this is debug only code.
+        (WebCore::fontCacheATSNotificationCallback): Ditto.
+
 2011-05-26  Stephanie Lewis  <slewis@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm

@@ -37 +37 @@
 #import "WebFontCache.h"
 #import <AppKit/AppKit.h>
+#import <wtf/MainThread.h>
 #import <wtf/StdLibExtras.h>
 
 
 namespace WebCore {
+
+// The "void*" parameter makes the function match the prototype for callbacks from callOnMainThread.
+static void invalidateFontCache(void*)
+{
+    if (!isMainThread()) {
+        callOnMainThread(&invalidateFontCache, 0);
+        return;
+    }
+    fontCache()->invalidate();
+}
 
 #if !defined(BUILDING_ON_LEOPARD)
@@ -47 +58 @@
     ASSERT_UNUSED(observer, observer == fontCache());
     ASSERT_UNUSED(name, CFEqual(name, kCTFontManagerRegisteredFontsChangedNotification));
-    fontCache()->invalidate();
+    invalidateFontCache(0);
 }
 #else
 static void fontCacheATSNotificationCallback(ATSFontNotificationInfoRef, void*)
 {
-    fontCache()->invalidate();
+    invalidateFontCache(0);
 }
 #endif