Diff
Modified: trunk/Source/WebCore/ChangeLog (98306 => 98307)
--- trunk/Source/WebCore/ChangeLog 2011-10-25 00:44:27 UTC (rev 98306)
+++ trunk/Source/WebCore/ChangeLog 2011-10-25 01:24:05 UTC (rev 98307)
@@ -1,3 +1,15 @@
+2011-10-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98294 and r98306.
+ http://trac.webkit.org/changeset/98294
+ http://trac.webkit.org/changeset/98306
+ https://bugs.webkit.org/show_bug.cgi?id=70790
+
+ the first patch broke chromium-mac and the second gclient
+ (Requested by jchaffraix on #webkit).
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-10-24 Ryosuke Niwa <[email protected]>
Build fix after r98300.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (98306 => 98307)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-25 00:44:27 UTC (rev 98306)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-10-25 01:24:05 UTC (rev 98307)
@@ -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 "exclude" list below.
+ # the specific exclusions in the "sources!" list below.
['include', 'rendering/RenderThemeMac\\.mm$'],
['include', 'platform/graphics/mac/ColorMac\\.mm$'],
['include', 'platform/graphics/mac/ComplexTextControllerCoreText\\.mm$'],
@@ -1505,10 +1505,6 @@
['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"
@@ -1522,7 +1518,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 "exclude" list below.
+ # the specific exclusions in the "sources!" list below.
['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
# Chromium Mac does not use skia.
Modified: trunk/Source/WebKit/chromium/ChangeLog (98306 => 98307)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 00:44:27 UTC (rev 98306)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-25 01:24:05 UTC (rev 98307)
@@ -1,3 +1,15 @@
+2011-10-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98294 and r98306.
+ http://trac.webkit.org/changeset/98294
+ http://trac.webkit.org/changeset/98306
+ https://bugs.webkit.org/show_bug.cgi?id=70790
+
+ the first patch broke chromium-mac and the second gclient
+ (Requested by jchaffraix on #webkit).
+
+ * WebKit.gypi:
+
2011-10-24 Nico Weber <[email protected]>
[chromium] Try to fix mac build after r98294
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (98306 => 98307)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 00:44:27 UTC (rev 98306)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2011-10-25 01:24:05 UTC (rev 98307)
@@ -75,6 +75,7 @@
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
'tests/PODRedBlackTreeTest.cpp',
+ 'tests/ScrollAnimatorNoneTest.cpp',
'tests/TilingDataTest.cpp',
'tests/TreeSynchronizerTest.cpp',
'tests/TreeTestHelpers.cpp',
@@ -98,10 +99,6 @@
'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.
