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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a072da7763565e0f7c570238b10184388a968ef6
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 06:03:54 2010 +0000

    Back out the italics portion of the previous patch until I can figure out why it
    doesn't work.
    
    * css/CSSFontSelector.cpp:
    (WebCore::compareFontFaces):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c8e785e..9c1edaf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-14  David Hyatt  <hyatt at apple.com>
+
+        Back out the italics portion of the previous patch until I can figure out why it
+        doesn't work.
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::compareFontFaces):
+
 2010-11-14  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/css/CSSFontSelector.cpp b/WebCore/css/CSSFontSelector.cpp
index 94cb0cb..cfc47e5 100644
--- a/WebCore/css/CSSFontSelector.cpp
+++ b/WebCore/css/CSSFontSelector.cpp
@@ -416,15 +416,6 @@ static inline bool compareFontFaces(CSSFontFace* first, CSSFontFace* second)
     if (firstHasDesiredStyle != secondHasDesiredStyle)
         return firstHasDesiredStyle;
 
-    if (desiredTraitsMaskForComparison & FontStyleItalicMask) {
-        // Prefer a font that has indicated that it can only support italic to a font that claims to support
-        // all styles.  The specialized font is more likely to be what the author wants.
-        bool firstRequiresItalics = (firstTraitsMask & FontStyleItalicMask) && !(firstTraitsMask & FontStyleNormalMask);
-        bool secondRequiresItalics = (secondTraitsMask & FontStyleItalicMask) && !(secondTraitsMask & FontStyleNormalMask);
-        if (firstRequiresItalics != secondRequiresItalics)
-            return firstRequiresItalics;
-    }
-
     if (secondTraitsMask & desiredTraitsMaskForComparison & FontWeightMask)
         return false;
     if (firstTraitsMask & desiredTraitsMaskForComparison & FontWeightMask)

-- 
WebKit Debian packaging