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

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit e51847c8923d30315953a063113979c86e12e233
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 8 03:56:30 2010 +0000

    Chromium Linux build fix.
    
    * platform/graphics/chromium/FontPlatformDataLinux.h: Add "class String" since a debug
    only method returns a String.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6284408..f9338d2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-07  David Levin  <levin at chromium.org>
+
+        Chromium Linux build fix.
+
+        * platform/graphics/chromium/FontPlatformDataLinux.h: Add "class String" since a debug
+        only method returns a String.
+
 2010-03-07  Mark Rowe  <mrowe at apple.com>
 
         Chromium build fix.
diff --git a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h
index 585471e..8f0a833 100644
--- a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h
+++ b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.h
@@ -45,6 +45,7 @@ struct HB_FaceRec_;
 namespace WebCore {
 
 class FontDescription;
+class String;
 
 // -----------------------------------------------------------------------------
 // FontPlatformData is the handle which WebKit has on a specific face. A face

-- 
WebKit Debian packaging