[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4d0fdcf736db94392ebae6f7be5258a05c146347
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 10:06:45 2009 +0000

    WebKitTools: Fix crash with tests that use custom font faces.
    
    Reviewed by Holger Freyther.
    
    https://bugs.webkit.org/show_bug.cgi?id=32600
    
    In the DRT we call QApplication::removeAllApplicationFonts(), to make sure
    that custom font faces between tests don't influence each other. Calling this
    function in Qt however also invalidates all existing handles with QFontDatabase.
    
    In order to make sure that WebCore also drops these handles we call QWebSettings::clearMemoryCaches(),
    which implies a call to WebCore::FontCache::fontCache()->invalidate().
    
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    (WebCore::DumpRenderTree::open):
    
    LayoutTests: [Qt] Unskip fast/css/font-face-multiple-families.html.
    
    Reviewed by Holger Freyther.
    
    * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 79d51fd..4f3b53b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-16  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Unskip fast/css/font-face-multiple-families.html.
+
+        * platform/qt/Skipped:
+
 2009-12-16  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2bdc26c..7024e7a 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -145,12 +145,6 @@ fast/canvas/canvas-getImageData.html
 fast/loader/empty-embed-src-attribute.html
 fast/text/find-hidden-text.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=32600
-#reproducible command: WebKitTools/Scripts/run-webkit-tests fast/css/font-face-multiple-families.html fast/css/font-face-unused-source-loaded.html
-#crashed: fast/css/font-face-unused-source-loaded.html
-#crasher:
-fast/css/font-face-multiple-families.html
-
 # ========================================================================= #
 # Crashing tests due to re-enabled Phonon support in Buildbot's Qt          #
 # Skip these until a proper solution for the Phonon related craches found.  #
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 252b490..6359d19 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-16  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        Fix crash with tests that use custom font faces.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32600
+
+        In the DRT we call QApplication::removeAllApplicationFonts(), to make sure
+        that custom font faces between tests don't influence each other. Calling this
+        function in Qt however also invalidates all existing handles with QFontDatabase.
+
+        In order to make sure that WebCore also drops these handles we call QWebSettings::clearMemoryCaches(),
+        which implies a call to WebCore::FontCache::fontCache()->invalidate().
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::open):
+
 2009-12-16  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index fbe6f33..d8469df 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -442,6 +442,7 @@ void DumpRenderTree::open(const QUrl& aurl)
     QFocusEvent ev(QEvent::FocusIn);
     m_page->event(&ev);
 
+    QWebSettings::clearMemoryCaches();
     QFontDatabase::removeAllApplicationFonts();
 #if defined(Q_WS_X11)
     initializeFonts();

-- 
WebKit Debian packaging