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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2b04b9ee9d989b626c217c0e94d8d90cd26a05d8
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 08:42:40 2010 +0000

    2010-08-18  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Printer font is different from screen font
            https://bugs.webkit.org/show_bug.cgi?id=43340
    
            Not testable because PNG output in layoutTestController.setPrinting
            for chromium isn't implemented yet.
    
            * platform/graphics/FontDescription.h: Use screen font even for printing on Mac Chromium
            (WebCore::FontDescription::setUsePrinterFont):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9a74d59..5d26f18 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-18  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Printer font is different from screen font
+        https://bugs.webkit.org/show_bug.cgi?id=43340
+
+        Not testable because PNG output in layoutTestController.setPrinting
+        for chromium isn't implemented yet.
+
+        * platform/graphics/FontDescription.h: Use screen font even for printing on Mac Chromium
+        (WebCore::FontDescription::setUsePrinterFont):
+
 2010-08-18  Renata Hodovan  <reni at inf.u-szeged.hu>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/FontDescription.h b/WebCore/platform/graphics/FontDescription.h
index 86a4349..48fcaad 100644
--- a/WebCore/platform/graphics/FontDescription.h
+++ b/WebCore/platform/graphics/FontDescription.h
@@ -103,7 +103,11 @@ public:
     void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
     void setWeight(FontWeight w) { m_weight = w; }
     void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; }
+#if PLATFORM(CHROMIUM) && OS(DARWIN)
+    void setUsePrinterFont(bool) { }
+#else
     void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
+#endif
     void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
     void setKeywordSize(unsigned s) { m_keywordSize = s; }
     void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoothing; }

-- 
WebKit Debian packaging