[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3b2d795c322e758a87c9b297a3daf09c4861fdde
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 02:33:37 2010 +0000

    Fix Acid3 in Safari for Windows
    
    Reviewed by Dave Hyatt.
    
    * platform/graphics/win/SimpleFontDataWin.cpp:
    (WebCore::SimpleFontData::initGDIFont): Initialize all our metrics to 0
    if we have a font size of 0.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3fcb06..b87222f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-17  Adam Roben  <aroben at apple.com>
+
+        Fix Acid3 in Safari for Windows
+
+        Reviewed by Dave Hyatt.
+
+        * platform/graphics/win/SimpleFontDataWin.cpp:
+        (WebCore::SimpleFontData::initGDIFont): Initialize all our metrics to 0
+        if we have a font size of 0.
+
 2010-11-17  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/win/SimpleFontDataWin.cpp b/WebCore/platform/graphics/win/SimpleFontDataWin.cpp
index cf80ec4..6d1d777 100644
--- a/WebCore/platform/graphics/win/SimpleFontDataWin.cpp
+++ b/WebCore/platform/graphics/win/SimpleFontDataWin.cpp
@@ -65,6 +65,18 @@ bool SimpleFontData::shouldApplyMacAscentHack()
 
 void SimpleFontData::initGDIFont()
 {
+    if (!m_platformData.size()) {
+        m_ascent = 0;
+        m_descent = 0;
+        m_lineGap = 0;
+        m_lineSpacing = 0;
+        m_avgCharWidth = 0;
+        m_maxCharWidth = 0;
+        m_xHeight = 0;
+        m_unitsPerEm = 0;
+        return;
+    }
+
      HDC hdc = GetDC(0);
      HGDIOBJ oldFont = SelectObject(hdc, m_platformData.hfont());
      OUTLINETEXTMETRIC metrics;

-- 
WebKit Debian packaging