Skip to content
Permalink
Browse files
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.

Canonical link: https://commits.webkit.org/58623@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67918 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Sep 21, 2010
1 parent e986b5d commit 761f77f3331cd2dab55a0557a5e0e016ee68ddb1
Showing 4 changed files with 20 additions and 2 deletions.
@@ -1,3 +1,19 @@
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>

Reviewed by David Levin.
@@ -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$'],
@@ -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',

0 comments on commit 761f77f

Please sign in to comment.