2010-10-21 Kwang Yul Seo <skyul@company100.net>

        Reviewed by James Robinson.

        Make sure skia is not Chromium specific
        https://bugs.webkit.org/show_bug.cgi?id=39672

        GlyphPageTreeNodeLinux does not depend on Linux or Chromium.
        Move GlyphPageTreeNodeLinux 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.

Canonical link: https://commits.webkit.org/60838@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

@@ -1,3 +1,19 @@
+2010-10-21  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by James Robinson.
+
+        Make sure skia is not Chromium specific
+        https://bugs.webkit.org/show_bug.cgi?id=39672
+
+        GlyphPageTreeNodeLinux does not depend on Linux or Chromium.
+        Move GlyphPageTreeNodeLinux 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-10-21  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Tony Chang.

WebCore/WebCore.gyp/WebCore.gyp

@@ -1077,7 +1077,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$'],
           ],
         }],
@@ -1206,6 +1205,10 @@
         ['OS=="win"', {
           'sources/': [
             ['exclude', 'Posix\\.cpp$'],
+
+            # The Chromium Win currently uses GlyphPageTreeNodeChromiumWin.cpp from
+            # platform/graphics/chromium, included by regex above, instead.
+            ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$']
           ],
         }],
         ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', {

WebCore/WebCore.gypi

@@ -2420,7 +2420,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',
@@ -2615,6 +2614,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',