[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 6d7d3f8f299656cee1ed8968d2070ef749d385dc
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 03:22:19 2010 +0000

    2010-09-09  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] Chromium mac build should exclude all Skia files in platform/graphics/skia/, not just some
            https://bugs.webkit.org/show_bug.cgi?id=45516
    
            This excludes platform/graphics/skia/*Skia.(h|cpp) by pattern instead of individual files.
            None of these files should be compiled into the Chromium mac build and the old file list had
            both omissions and stale entries.
    
            * WebCore.gyp/WebCore.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e274d15..4065185 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-09  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Chromium mac build should exclude all Skia files in platform/graphics/skia/, not just some
+        https://bugs.webkit.org/show_bug.cgi?id=45516
+
+        This excludes platform/graphics/skia/*Skia.(h|cpp) by pattern instead of individual files.
+        None of these files should be compiled into the Chromium mac build and the old file list had
+        both omissions and stale entries.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-09-09  Dirk Pranke  <dpranke at chromium.org>
 
         Unreviewed, rolling out r67145.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index bee2cd7..6282530 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -1212,6 +1212,9 @@
             ['include', 'platform/Theme\\.cpp$'],
 
             ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
+
+            # Chromium Mac does not use skia.
+            ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
           ],
           'sources!': [
             # The Mac uses platform/mac/KillRingMac.mm instead of the dummy
@@ -1230,22 +1233,6 @@
             # by regex above, instead.
             '../platform/graphics/ImageSource.cpp',
 
-            # These Skia files aren't currently built on the Mac, which uses
-            # CoreGraphics directly for this portion of graphics handling.
-            '../platform/graphics/skia/FloatPointSkia.cpp',
-            '../platform/graphics/skia/FloatRectSkia.cpp',
-            '../platform/graphics/skia/GradientSkia.cpp',
-            '../platform/graphics/skia/GraphicsContext3DSkia.cpp',
-            '../platform/graphics/skia/GraphicsContextSkia.cpp',
-            '../platform/graphics/skia/ImageBufferSkia.cpp',
-            '../platform/graphics/skia/ImageSkia.cpp',
-            '../platform/graphics/skia/ImageSourceSkia.cpp',
-            '../platform/graphics/skia/IntPointSkia.cpp',
-            '../platform/graphics/skia/IntRectSkia.cpp',
-            '../platform/graphics/skia/PathSkia.cpp',
-            '../platform/graphics/skia/PatternSkia.cpp',
-            '../platform/graphics/skia/TransformationMatrixSkia.cpp',
-
             # RenderThemeChromiumSkia is not used on mac since RenderThemeChromiumMac
             # does not reference the Skia code that is used by Windows and Linux.
             '../rendering/RenderThemeChromiumSkia.cpp',

-- 
WebKit Debian packaging