[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 834690d06f0c89855d96ac397b847408bee20a4c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 20:32:47 2010 +0000

    2010-09-09  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
    
            FontCustomPlatformData is not Chromium-specific. Move it to platform/skia.
    
            No new tests because this is pure refactoring.
    
            * WebCore.gyp/WebCore.gyp:
            * WebCore.gypi:
            * platform/graphics/chromium/FontCustomPlatformData.cpp: Removed.
            * platform/graphics/chromium/FontCustomPlatformData.h: Removed.
            * platform/graphics/skia/FontCustomPlatformData.cpp: Copied from WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp.
            * platform/graphics/skia/FontCustomPlatformData.h: Copied from WebCore/platform/graphics/chromium/FontCustomPlatformData.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ffd4e22..84c9c59 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-09  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
+
+        FontCustomPlatformData is not Chromium-specific. Move it to platform/skia.
+
+        No new tests because this is pure refactoring.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/chromium/FontCustomPlatformData.cpp: Removed.
+        * platform/graphics/chromium/FontCustomPlatformData.h: Removed.
+        * platform/graphics/skia/FontCustomPlatformData.cpp: Copied from WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp.
+        * platform/graphics/skia/FontCustomPlatformData.h: Copied from WebCore/platform/graphics/chromium/FontCustomPlatformData.h.
+
 2010-09-09  Chris Rogers  <crogers at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index c4f1f44..bee2cd7 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -1220,7 +1220,7 @@
 
             # The Mac currently uses FontCustomPlatformData.cpp from
             # platform/graphics/mac, included by regex above, instead.
-            '../platform/graphics/chromium/FontCustomPlatformData.cpp',
+            '../platform/graphics/skia/FontCustomPlatformData.cpp',
 
             # The Mac currently uses ScrollbarThemeChromiumMac.mm, which is not
             # related to ScrollbarThemeChromium.cpp.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 5de16e0..83890b6 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2288,8 +2288,6 @@
             'platform/graphics/chromium/FontCacheChromiumWin.cpp',
             'platform/graphics/chromium/FontCacheLinux.cpp',
             'platform/graphics/chromium/FontChromiumWin.cpp',
-            'platform/graphics/chromium/FontCustomPlatformData.cpp',
-            'platform/graphics/chromium/FontCustomPlatformData.h',
             'platform/graphics/chromium/FontLinux.cpp',
             'platform/graphics/chromium/FontPlatformData.h',
             'platform/graphics/chromium/FontPlatformDataChromiumWin.cpp',
@@ -2462,6 +2460,8 @@
             'platform/graphics/skia/BitmapImageSingleFrameSkia.h',
             'platform/graphics/skia/FloatPointSkia.cpp',
             'platform/graphics/skia/FloatRectSkia.cpp',
+            'platform/graphics/skia/FontCustomPlatformData.cpp',
+            'platform/graphics/skia/FontCustomPlatformData.h',
             'platform/graphics/skia/GradientSkia.cpp',
             'platform/graphics/skia/GraphicsContextPlatformPrivate.h',
             'platform/graphics/skia/GraphicsContextSkia.cpp',
diff --git a/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp b/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
similarity index 100%
rename from WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp
rename to WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
diff --git a/WebCore/platform/graphics/chromium/FontCustomPlatformData.h b/WebCore/platform/graphics/skia/FontCustomPlatformData.h
similarity index 100%
rename from WebCore/platform/graphics/chromium/FontCustomPlatformData.h
rename to WebCore/platform/graphics/skia/FontCustomPlatformData.h

-- 
WebKit Debian packaging