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

[zecke at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c4f770208cff3c940d92d267f79c48672d53745a
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 17:23:55 2010 +0000

    [cairo] Typo in determining fixed width fonts
    https://bugs.webkit.org/show_bug.cgi?id=47470
    
    It must be a single ampersand otherwise the
    && FT_FACE_FLAG_FIXED_WIDTH will always be true.
    
    * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
    (WebCore::FontPlatformData::FontPlatformData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index acaf9fe..2ca30c7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-14  Holger Hans Peter Freyther  <holger at moiji-mobile.com>
+
+        Reviewed by Martin Robinson.
+
+        [cairo] Typo in determining fixed width fonts
+        https://bugs.webkit.org/show_bug.cgi?id=47470
+
+        It must be a single ampersand otherwise the
+        && FT_FACE_FLAG_FIXED_WIDTH will always be true.
+
+        * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2010-10-14  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
index 6a4b896..d09ca74 100644
--- a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
+++ b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
@@ -135,7 +135,7 @@ FontPlatformData::FontPlatformData(cairo_font_face_t* fontFace, float size, bool
 
     FT_Face fontConfigFace = cairo_ft_scaled_font_lock_face(m_scaledFont.get());
     if (fontConfigFace) {
-        m_fixedWidth = fontConfigFace->face_flags && FT_FACE_FLAG_FIXED_WIDTH;
+        m_fixedWidth = fontConfigFace->face_flags & FT_FACE_FLAG_FIXED_WIDTH;
         cairo_ft_scaled_font_unlock_face(m_scaledFont.get());
     }
 }

-- 
WebKit Debian packaging