Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

WebCore/WebCore.gyp/WebCore.gyp

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 1261 matching lines @@
             '../platform/image-decoders/xbm/XBMImageDecoder.h',
 
             # Again, Skia is not used on Mac.
             '../platform/chromium/DragImageChromiumSkia.cpp',
           ],
         }],
         ['OS=="win"', {
           'sources/': [
             ['exclude', 'Posix\\.cpp$'],
             ['include', '/opentype/'],
+            ['include', '/ScrollAnimatorWin\\.cpp$'],
+            ['include', '/ScrollAnimatorWin\\.h$'],
             ['include', '/SkiaFontWin\\.cpp$'],
             ['include', '/TransparencyWin\\.cpp$'],
           ],
         }],
         ['OS!="linux" and OS!="freebsd"', {
           'sources/': [['exclude', '(Gtk|Linux)\\.cpp$']]
         }],
         ['OS!="mac"', {
           'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
         }],
@@ skipping 56 matching lines @@
         }],
         ['enable_svg!=0', {
           'dependencies': [
             'webcore_svg',
           ],
         }],
       ],
     },
   ],  # targets
 }