Diff
Modified: trunk/Source/WebCore/ChangeLog (104459 => 104460)
--- trunk/Source/WebCore/ChangeLog 2012-01-09 15:08:42 UTC (rev 104459)
+++ trunk/Source/WebCore/ChangeLog 2012-01-09 15:19:59 UTC (rev 104460)
@@ -1,3 +1,14 @@
+2012-01-09 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r104418.
+ http://trac.webkit.org/changeset/104418
+ https://bugs.webkit.org/show_bug.cgi?id=75855
+
+ we still need to build against CG on Mac sometimes (Requested
+ by epoger on #webkit).
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-01-09 Martin Robinson <mrobin...@igalia.com>
[GTK] [AC] Simplify accelerated compositing build options
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (104459 => 104460)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-01-09 15:08:42 UTC (rev 104459)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-01-09 15:19:59 UTC (rev 104460)
@@ -186,6 +186,18 @@
'<@(webcore_svg_bindings_idl_files)',
],
}],
+ ['OS=="mac" and use_skia==0', {
+ 'webcore_include_dirs+': [
+ # platform/graphics/cg and cocoa need to come before
+ # platform/graphics/chromium so that the Mac build picks up the
+ # version of ImageBufferData.h in the cg directory and
+ # FontPlatformData.h in the cocoa directory. The + prepends this
+ # directory to the list.
+ # FIXME: This shouldn't need to be prepended.
+ '../platform/graphics/cocoa',
+ '../platform/graphics/cg',
+ ],
+ }],
['OS=="mac"', {
'webcore_include_dirs': [
# FIXME: Eliminate dependency on platform/mac and related
@@ -200,7 +212,7 @@
'../platform/text/mac',
],
}],
- ['OS=="mac"', {
+ ['OS=="mac" and use_skia==1', {
'webcore_include_dirs': [
'../platform/graphics/cocoa',
'../platform/graphics/cg',
@@ -1509,6 +1521,15 @@
['include', 'platform/graphics/opentype/OpenTypeSanitizer\\.cpp$'],
],
}],
+ ['OS=="mac" and use_skia==0', {
+ 'sources/': [
+ # The Mac build is PLATFORM_CG too. platform/graphics/cg is the
+ # only place that CG files we want to build are located, and not
+ # all of them even have a CG suffix, so just add them by a
+ # regexp matching their directory.
+ ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
+ ],
+ }],
['OS=="mac"', {
# Necessary for Mac .mm stuff.
'include_dirs': [
@@ -1605,8 +1626,30 @@
['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
],
}],
- ['OS=="mac"', {
+ ['OS=="mac" and use_skia==0', {
'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.
+ ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
+
+ # Chromium Mac does not use skia.
+ ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
+
+ # The Mac currently uses ImageChromiumMac.mm from
+ # platform/graphics/chromium, included by regex above, instead.
+ ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
+
+ # ImageDecoderSkia is not used on mac. ImageDecoderCG is used instead.
+ ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
+ ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
+
+ # Again, Skia is not used on Mac.
+ ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
+ ],
+ }],
+ ['OS=="mac" and use_skia==1', {
+ 'sources/': [
['include', 'platform/graphics/cg/FloatPointCG\\.cpp$'],
['include', 'platform/graphics/cg/FloatRectCG\\.cpp$'],
['include', 'platform/graphics/cg/FloatSizeCG\\.cpp$'],
@@ -1620,7 +1663,7 @@
['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
],
}],
- ['use_x11 == 0 and (OS!="mac")', {
+ ['use_x11 == 0 and (OS!="mac" or use_skia==0)', {
'sources/': [
['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
Modified: trunk/Source/WebKit/chromium/ChangeLog (104459 => 104460)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-09 15:08:42 UTC (rev 104459)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-09 15:19:59 UTC (rev 104460)
@@ -1,3 +1,15 @@
+2012-01-09 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r104418.
+ http://trac.webkit.org/changeset/104418
+ https://bugs.webkit.org/show_bug.cgi?id=75855
+
+ we still need to build against CG on Mac sometimes (Requested
+ by epoger on #webkit).
+
+ * WebKit.gyp:
+ * WebKit.gypi:
+
2012-01-08 David Levin <le...@chromium.org>
[chromium] iframes in an autoresized window get sized incorrectly.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (104459 => 104460)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-09 15:08:42 UTC (rev 104459)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-09 15:19:59 UTC (rev 104460)
@@ -803,8 +803,16 @@
'include_dirs': [
'public/mac',
],
- 'sources/': [
- ['exclude', 'CG\\.cpp$'],
+ 'conditions': [
+ ['use_skia==0', {
+ 'sources/': [
+ ['exclude', 'Skia\\.cpp$'],
+ ],
+ },{ # use_skia
+ 'sources/': [
+ ['exclude', 'CG\\.cpp$'],
+ ],
+ }],
],
}, { # else: OS!="mac"
'sources/': [
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (104459 => 104460)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-01-09 15:08:42 UTC (rev 104459)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-01-09 15:19:59 UTC (rev 104460)
@@ -59,6 +59,7 @@
'webkit_unittest_files': [
'tests/ArenaTestHelpers.h',
'tests/AssociatedURLLoaderTest.cpp',
+ 'tests/Canvas2DLayerChromiumTest.cpp',
'tests/CCDamageTrackerTest.cpp',
'tests/CCDelayBasedTimeSourceTest.cpp',
'tests/CCFrameRateControllerTest.cpp',
@@ -72,15 +73,13 @@
'tests/CCQuadCullerTest.cpp',
'tests/CCRenderSurfaceTest.cpp',
'tests/CCSchedulerStateMachineTest.cpp',
+ 'tests/CCSchedulerTestCommon.h',
'tests/CCSchedulerTest.cpp',
- 'tests/CCSchedulerTestCommon.h',
+ 'tests/CCTiledLayerImplTest.cpp',
'tests/CCThreadTaskTest.cpp',
- 'tests/CCTiledLayerImplTest.cpp',
'tests/CCTimerTest.cpp',
- 'tests/Canvas2DLayerChromiumTest.cpp',
'tests/CompositorFakeGraphicsContext3D.h',
'tests/CompositorFakeWebGraphicsContext3D.h',
- 'tests/DragImageTest.cpp',
'tests/FakeGraphicsContext3DTest.cpp',
'tests/FakeWebGraphicsContext3D.h',
'tests/FloatQuadTest.cpp',
@@ -89,10 +88,9 @@
'tests/IDBBindingUtilitiesTest.cpp',
'tests/IDBKeyPathTest.cpp',
'tests/IDBLevelDBCodingTest.cpp',
- 'tests/ImageLayerChromiumTest.cpp',
'tests/InnerGestureRecognizerTest.cpp',
+ 'tests/KeyboardTest.cpp',
'tests/KURLTest.cpp',
- 'tests/KeyboardTest.cpp',
'tests/LayerChromiumTest.cpp',
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
@@ -115,6 +113,12 @@
],
'conditions': [
+ ['use_skia == 1', {
+ 'webkit_unittest_files': [
+ 'tests/DragImageTest.cpp',
+ 'tests/ImageLayerChromiumTest.cpp',
+ ],
+ }],
['OS=="win"', {
'webkit_unittest_files': [
# FIXME: Port PopupMenuTest to Linux and Mac.
