Changeset 67918 in webkit

Timestamp:

Sep 20, 2010 8:45:15 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-20 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

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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (2 diffs)
• WebCore.gypi (modified) (2 diffs)
• platform/graphics/skia/GlyphPageTreeNodeSkia.cpp (moved) (moved from trunk/WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-20  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
+
+        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@chromium.org>
 

trunk/WebCore/WebCore.gyp/WebCore.gyp

@@ -1049 +1049 @@
             ['include', 'platform/graphics/chromium/FontLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/FontPlatformDataLinux\\.cpp$'],
-            ['include', 'platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'],
             ['include', 'platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'],
           ],
@@ -1298 +1297 @@
           '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$'],

trunk/WebCore/WebCore.gypi

@@ -2319 +2319 @@
             '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',
@@ -2487 +2486 @@
             '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',