2011-03-25 Tony Chang <tony@chromium.org>
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2011 20:40:58 +0000 (20:40 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2011 20:40:58 +0000 (20:40 +0000)
        Try to fix the chromium mac build.
        We used the mac FontPlatformData on chromium mac.

        * WebCore.gyp/WebCore.gyp:
        * WebCore.gypi:
        * platform/graphics/FontPlatformData.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@81988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/platform/graphics/FontPlatformData.h

index 86995fd..6442655 100644 (file)
@@ -1,5 +1,14 @@
 2011-03-25  Tony Chang  <tony@chromium.org>
 
+        Try to fix the chromium mac build.
+        We used the mac FontPlatformData on chromium mac.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * platform/graphics/FontPlatformData.h:
+
+2011-03-25  Tony Chang  <tony@chromium.org>
+
         Build fix:
         have chromium and qt use the correct FontPlatformData.h
         https://bugs.webkit.org/show_bug.cgi?id=57115
index 4fa956f..e692f54 100644 (file)
             # Again, Skia is not used on Mac.
             ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
           ],
+        },{ # OS!="mac"
+          'sources/': [
+            # FIXME: We will eventually compile this too, but for now it's
+            # only used on mac.
+            ['exclude', 'platform/graphics/FontPlatformData\\.cpp$']
+          ],
         }],
         ['OS!="linux" and OS!="freebsd"', {
           'sources/': [
index a8b75dc..a83d332 100644 (file)
             'platform/graphics/TextRun.h',
             'platform/graphics/TypesettingFeatures.h',
             'platform/graphics/cg/ImageBufferData.h',
-            'platform/graphics/cocoa/FontPlatformData.h',
             'platform/graphics/mac/ColorMac.h',
             'platform/graphics/mac/MediaPlayerProxy.h',
             'platform/graphics/transforms/AffineTransform.h',
             'platform/graphics/FontFallbackList.cpp',
             'platform/graphics/FontFamily.cpp',
             'platform/graphics/FontFastPath.cpp',
+            'platform/graphics/FontPlatformData.cpp',
+            'platform/graphics/FontPlatformData.h',
             'platform/graphics/GeneratedImage.cpp',
             'platform/graphics/GeneratedImage.h',
             'platform/graphics/GlyphPageTreeNode.cpp',
             'platform/graphics/cg/FloatPointCG.cpp',
             'platform/graphics/cg/FloatRectCG.cpp',
             'platform/graphics/cg/FloatSizeCG.cpp',
-            'platform/graphics/cg/FontPlatformData.h',
             'platform/graphics/cg/GradientCG.cpp',
             'platform/graphics/cg/GraphicsContext3DCG.cpp',
             'platform/graphics/cg/GraphicsContextCG.cpp',
index 37cae1d..5600b15 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 // FIXME: This is temporary until Chromium and QT switch to using this file.
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) && !OS(DARWIN)
 #include "chromium/FontPlatformData.h"
 #elif PLATFORM(QT)
 #include "qt/FontPlatformData.h"