Modified: trunk/Source/WebCore/ChangeLog (98293 => 98294)
--- trunk/Source/WebCore/ChangeLog 2011-10-24 22:56:01 UTC (rev 98293)
+++ trunk/Source/WebCore/ChangeLog 2011-10-24 23:02:05 UTC (rev 98294)
@@ -1,3 +1,15 @@
+2011-10-24 Nico Weber <[email protected]>
+
+ [chromium/mac] Fix an ODR violation.
+ https://bugs.webkit.org/show_bug.cgi?id=70753
+
+ Reviewed by Anders Carlsson.
+
+ Both ScrollAnimatorNone and ScrollAnimatorMac define ScrollAnimator::create() on OS X.
+ Remove the unused one.
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-10-24 Tim Horton <[email protected]>
feColorMatrix doesn't use the correct default "matrix" type when no type attribute is specified
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (98293 => 98294)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-24 22:56:01 UTC (rev 98293)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-24 23:02:05 UTC (rev 98294)
@@ -1465,7 +1465,7 @@
# Cherry-pick some files that can't be included by broader regexps.
# Some of these are used instead of Chromium platform files, see
- # the specific exclusions in the "sources!" list below.
+ # the specific exclusions in the "exclude" list below.
['include', 'rendering/RenderThemeMac\\.mm$'],
['include', 'platform/graphics/mac/ColorMac\\.mm$'],
['include', 'platform/graphics/mac/ComplexTextControllerCoreText\\.mm$'],
@@ -1505,6 +1505,10 @@
['exclude', 'platform/graphics/cg/ImageSourceCG\\.cpp$'],
['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'],
+ # Mac uses only ScrollAnimatorMac.
+ ['exclude', 'platform/ScrollAnimatorNone\\.cpp$'],
+ ['exclude', 'platform/ScrollAnimatorNone\\.h$'],
+
['include', '/chrome/junk\\.txt$'],
],
},{ # OS!="mac"
@@ -1518,7 +1522,7 @@
'sources/': [
# Cherry-pick some files that can't be included by broader regexps.
# Some of these are used instead of Chromium platform files, see
- # the specific exclusions in the "sources!" list below.
+ # the specific exclusions in the "exclude" list below.
['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
# Chromium Mac does not use skia.
