Title: [98306] trunk/Source/WebKit/chromium
- Revision
- 98306
- Author
- [email protected]
- Date
- 2011-10-24 17:44:27 -0700 (Mon, 24 Oct 2011)
Log Message
[chromium] Try to fix mac build after r98294
https://bugs.webkit.org/show_bug.cgi?id=70785
Remove test for ScrollAnimatorNone on mac.
Unreviewed, build fix.
Patch by Nico Weber <[email protected]> on 2011-10-24
* WebKit.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (98305 => 98306)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 00:44:17 UTC (rev 98305)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 00:44:27 UTC (rev 98306)
@@ -1,3 +1,14 @@
+2011-10-24 Nico Weber <[email protected]>
+
+ [chromium] Try to fix mac build after r98294
+ https://bugs.webkit.org/show_bug.cgi?id=70785
+
+ Remove test for ScrollAnimatorNone on mac.
+
+ Unreviewed, build fix.
+
+ * WebKit.gypi:
+
2011-10-24 Sheriff Bot <[email protected]>
Unreviewed, rolling out r98266.
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (98305 => 98306)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 00:44:17 UTC (rev 98305)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 00:44:27 UTC (rev 98306)
@@ -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,10 @@
'tests/WebPageSerializerTest.cpp',
],
}],
+ ['OS!="mac"', {
+ # Mac uses ScrollAnimatorMac instead of ScrollAnimatorNone.
+ 'tests/ScrollAnimatorNoneTest.cpp',
+ }],
['toolkit_uses_gtk == 1', {
'webkit_unittest_files': [
# FIXME: Port DragImageTest to Mac.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
