- Revision
- 98347
- Author
- tha...@chromium.org
- Date
- 2011-10-25 08:21:15 -0700 (Tue, 25 Oct 2011)
Log Message
Source/WebCore: [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:
Source/WebKit/chromium: [chromium] Try to fix mac build after r98294
https://bugs.webkit.org/show_bug.cgi?id=70753
Remove test for ScrollAnimatorNone on mac.
Unreviewed, build fix.
* WebKit.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98346 => 98347)
--- trunk/Source/WebCore/ChangeLog 2011-10-25 15:06:00 UTC (rev 98346)
+++ trunk/Source/WebCore/ChangeLog 2011-10-25 15:21:15 UTC (rev 98347)
@@ -1,3 +1,15 @@
+2011-10-25 Nico Weber <tha...@chromium.org>
+
+ [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-25 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Debugger fails when there is an invalid watch _expression_.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (98346 => 98347)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-25 15:06:00 UTC (rev 98346)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-25 15:21:15 UTC (rev 98347)
@@ -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.
Modified: trunk/Source/WebKit/chromium/ChangeLog (98346 => 98347)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 15:06:00 UTC (rev 98346)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 15:21:15 UTC (rev 98347)
@@ -1,3 +1,14 @@
+2011-10-25 Nico Weber <tha...@chromium.org>
+
+ [chromium] Try to fix mac build after r98294
+ https://bugs.webkit.org/show_bug.cgi?id=70753
+
+ Remove test for ScrollAnimatorNone on mac.
+
+ Unreviewed, build fix.
+
+ * WebKit.gypi:
+
2011-10-24 Geoffrey Garen <gga...@apple.com>
Removed SharedUChar and tightened language around its previous uses
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (98346 => 98347)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 15:06:00 UTC (rev 98346)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 15:21:15 UTC (rev 98347)
@@ -75,7 +75,6 @@
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
'tests/PODRedBlackTreeTest.cpp',
- 'tests/ScrollAnimatorNoneTest.cpp',
'tests/TilingDataTest.cpp',
'tests/TreeSynchronizerTest.cpp',
'tests/TreeTestHelpers.cpp',
@@ -99,6 +98,12 @@
'tests/WebPageSerializerTest.cpp',
],
}],
+ ['OS!="mac"', {
+ 'webkit_unittest_files': [
+ # Mac uses ScrollAnimatorMac instead of ScrollAnimatorNone.
+ 'tests/ScrollAnimatorNoneTest.cpp',
+ ],
+ }],
['toolkit_uses_gtk == 1', {
'webkit_unittest_files': [
# FIXME: Port DragImageTest to Mac.
