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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c7373d09ccb0a506adaacf047ae0d7ad0eddbaae
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 04:36:19 2010 +0000

    2010-09-20  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r67918.
            http://trac.webkit.org/changeset/67918
            https://bugs.webkit.org/show_bug.cgi?id=46162
    
            Broke chromium win compile (Requested by jamesr on #webkit).
    
            * WebCore.gyp/WebCore.gyp:
            * WebCore.gypi:
            * platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp: Renamed from WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp.
            (WebCore::GlyphPage::fill):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 77ef188..b575755 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-20  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r67918.
+        http://trac.webkit.org/changeset/67918
+        https://bugs.webkit.org/show_bug.cgi?id=46162
+
+        Broke chromium win compile (Requested by jamesr on #webkit).
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp: Renamed from WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp.
+        (WebCore::GlyphPage::fill):
+
 2010-09-20  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index f660127..2745cfa 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -1048,6 +1048,7 @@
             ['include', 'platform/graphics/chromium/FontCacheLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/FontLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/FontPlatformDataLinux\\.cpp$'],
+            ['include', 'platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'],
           ],
         }],
@@ -1296,9 +1297,6 @@
         ['OS=="win"', {
           'sources/': [
             ['exclude', 'Posix\\.cpp$'],
-            # The Chromium Win uses GlyphPageTreeNodeChromiumWin.cpp from platform/graphics/chromium,
-            # included by regex above, instead.
-            ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
             ['include', '/opentype/'],
             ['include', '/ScrollAnimatorWin\\.cpp$'],
             ['include', '/ScrollAnimatorWin\\.h$'],
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 7915b6d..528dc3c 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2318,6 +2318,7 @@
             'platform/graphics/chromium/GLES2Canvas.cpp',
             'platform/graphics/chromium/GLES2Canvas.h',
             'platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp',
+            'platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp',
             'platform/graphics/chromium/GraphicsLayerChromium.cpp',
             'platform/graphics/chromium/GraphicsLayerChromium.h',
             'platform/graphics/chromium/HarfbuzzSkia.cpp',
@@ -2485,7 +2486,6 @@
             'platform/graphics/skia/FloatRectSkia.cpp',
             'platform/graphics/skia/FontCustomPlatformData.cpp',
             'platform/graphics/skia/FontCustomPlatformData.h',
-            'platform/graphics/skia/GlyphPageTreeNodeSkia.cpp',
             'platform/graphics/skia/GradientSkia.cpp',
             'platform/graphics/skia/GraphicsContextPlatformPrivate.h',
             'platform/graphics/skia/GraphicsContextSkia.cpp',
diff --git a/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp b/WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp
similarity index 100%
rename from WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
rename to WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp

-- 
WebKit Debian packaging