[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 10abcabdf23c8f1237e6923877accdd2ef738b6d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 03:45:15 2010 +0000

    2010-09-20  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by James Robinson.
    
            Make sure skia is not Chromium specific
            https://bugs.webkit.org/show_bug.cgi?id=39672
    
            GGlyphPageTreeNodeLinux does not depend on Linux or Chromium.
            Move GGlyphPageTreeNodeLinux to platform/graphics/skia and rename it to
            GlyphPageTreeNodeSkia.cpp so that other ports can use it.
    
            * WebCore.gyp/WebCore.gyp:
            * WebCore.gypi:
            * platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp: Removed.
            * platform/graphics/skia/GlyphPageTreeNodeSkia.cpp: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d5c03d..723133e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-20  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by James Robinson.
+
+        Make sure skia is not Chromium specific
+        https://bugs.webkit.org/show_bug.cgi?id=39672
+
+        GGlyphPageTreeNodeLinux does not depend on Linux or Chromium.
+        Move GGlyphPageTreeNodeLinux to platform/graphics/skia and rename it to
+        GlyphPageTreeNodeSkia.cpp so that other ports can use it.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp: Removed.
+        * platform/graphics/skia/GlyphPageTreeNodeSkia.cpp: Added.
+
 2010-09-20  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 2745cfa..f660127 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -1048,7 +1048,6 @@
             ['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$'],
           ],
         }],
@@ -1297,6 +1296,9 @@
         ['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 528dc3c..7915b6d 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2318,7 +2318,6 @@
             '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',
@@ -2486,6 +2485,7 @@
             '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/chromium/GlyphPageTreeNodeLinux.cpp b/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
similarity index 100%
rename from WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp
rename to WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp

-- 
WebKit Debian packaging