Diff
Modified: trunk/Source/WebCore/ChangeLog (110055 => 110056)
--- trunk/Source/WebCore/ChangeLog 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebCore/ChangeLog 2012-03-07 16:35:28 UTC (rev 110056)
@@ -1,3 +1,12 @@
+2012-03-07 Elliot Poger <epo...@google.com>
+
+ [Chromium] Remove use_skia option from GYP
+ https://bugs.webkit.org/show_bug.cgi?id=75811
+
+ Reviewed by Tony Chang.
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-03-07 Yoshifumi Inoue <yo...@chromium.org>
[Forms] Introduce LabelableElement to share "labels" attribute implementation
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (110055 => 110056)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-07 16:35:28 UTC (rev 110056)
@@ -193,18 +193,6 @@
'<@(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
@@ -214,17 +202,13 @@
# platform/graphics/cg may need to stick around, though.
'../platform/audio/mac',
'../platform/cocoa',
+ '../platform/graphics/cg',
+ '../platform/graphics/cocoa',
'../platform/graphics/mac',
'../platform/mac',
'../platform/text/mac',
],
}],
- ['OS=="mac" and use_skia==1', {
- 'webcore_include_dirs': [
- '../platform/graphics/cocoa',
- '../platform/graphics/cg',
- ],
- }],
['OS=="win"', {
'webcore_include_dirs': [
'../page/win',
@@ -1518,15 +1502,6 @@
['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': [
@@ -1623,30 +1598,8 @@
['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
],
}],
- ['OS=="mac" and use_skia==0', {
+ ['OS=="mac"', {
'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$'],
@@ -1661,7 +1614,7 @@
['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
],
}],
- ['use_x11 == 0 and (OS!="mac" or use_skia==0)', {
+ ['use_x11 == 0 and OS != "mac"', {
'sources/': [
['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
Modified: trunk/Source/WebKit/chromium/ChangeLog (110055 => 110056)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-07 16:35:28 UTC (rev 110056)
@@ -1,3 +1,14 @@
+2012-03-07 Elliot Poger <epo...@google.com>
+
+ [Chromium] Remove use_skia option from GYP
+ https://bugs.webkit.org/show_bug.cgi?id=75811
+
+ Reviewed by Tony Chang.
+
+ * WebKit.gyp:
+ * WebKit.gypi:
+ * features.gypi:
+
2012-03-06 Dana Jansens <dan...@chromium.org>
[chromium] Add clipping to scissor rect to CCOcclusionTracker
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (110055 => 110056)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-07 16:35:28 UTC (rev 110056)
@@ -826,20 +826,13 @@
['exclude', '/android/'],
],
}],
+ # TODO: we exclude CG.cpp on both sides of the below conditional. Move elsewhere?
['OS=="mac"', {
'include_dirs': [
'public/mac',
],
- 'conditions': [
- ['use_skia==0', {
- 'sources/': [
- ['exclude', 'Skia\\.cpp$'],
- ],
- },{ # use_skia
- 'sources/': [
- ['exclude', 'CG\\.cpp$'],
- ],
- }],
+ 'sources/': [
+ ['exclude', 'CG\\.cpp$'],
],
}, { # else: OS!="mac"
'sources/': [
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (110055 => 110056)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-03-07 16:35:28 UTC (rev 110056)
@@ -92,6 +92,7 @@
'tests/ClipboardChromiumTest.cpp',
'tests/CompositorFakeGraphicsContext3D.h',
'tests/CompositorFakeWebGraphicsContext3D.h',
+ 'tests/DragImageTest.cpp',
'tests/FakeCCLayerTreeHostClient.h',
'tests/FakeGraphicsContext3DTest.cpp',
'tests/FakeWebGraphicsContext3D.h',
@@ -101,12 +102,14 @@
'tests/IDBBindingUtilitiesTest.cpp',
'tests/IDBKeyPathTest.cpp',
'tests/IDBLevelDBCodingTest.cpp',
+ 'tests/ImageLayerChromiumTest.cpp',
'tests/KeyboardTest.cpp',
'tests/KURLTest.cpp',
'tests/LayerChromiumTest.cpp',
'tests/LayerTextureUpdaterTest.cpp',
'tests/LocalizedNumberICUTest.cpp',
'tests/PaintAggregatorTest.cpp',
+ 'tests/PlatformContextSkiaTest.cpp',
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
'tests/PODRedBlackTreeTest.cpp',
@@ -132,13 +135,6 @@
],
'conditions': [
- ['use_skia == 1', {
- 'webkit_unittest_files': [
- 'tests/DragImageTest.cpp',
- 'tests/ImageLayerChromiumTest.cpp',
- 'tests/PlatformContextSkiaTest.cpp',
- ],
- }],
['OS=="win"', {
'webkit_unittest_files': [
# FIXME: Port PopupMenuTest to Linux and Mac.
Modified: trunk/Source/WebKit/chromium/features.gypi (110055 => 110056)
--- trunk/Source/WebKit/chromium/features.gypi 2012-03-07 16:29:37 UTC (rev 110055)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-03-07 16:35:28 UTC (rev 110056)
@@ -120,7 +120,6 @@
'enable_svg%': 1,
'enable_viewport%': 0,
'enable_touch_events%': 1,
- 'use_skia%': 0,
'enable_touch_icon_loading%' : 0,
'enable_mutation_observers%': 1,
},
@@ -128,7 +127,6 @@
'enable_skia_text%': '<(enable_skia_text)',
'enable_svg%': '<(enable_svg)',
'enable_touch_events%': '<(enable_touch_events)',
- 'use_skia%': '<(use_skia)',
'conditions': [
['OS=="android"', {
'feature_defines': [
@@ -145,7 +143,7 @@
'ENABLE_3D_RENDERING=1',
],
}],
- ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {
+ ['use_accelerated_compositing==1', {
'feature_defines': [
'ENABLE_ACCELERATED_2D_CANVAS=1',
],
@@ -155,7 +153,6 @@
'feature_defines': [
'WTF_USE_WEBAUDIO_FFMPEG=1',
],
- 'use_skia%': 1,
}],
['enable_register_protocol_handler==1', {
'feature_defines': [
@@ -170,7 +167,7 @@
['OS=="mac"', {
'feature_defines': [
'ENABLE_RUBBER_BANDING=1',
- 'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',
+ 'WTF_USE_SKIA_ON_MAC_CHROMIUM=1',
],
}],
],
