[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:31:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 50127f0620b1c27ba5adfd23c633f4699608689e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 17 22:23:22 2010 +0000
2010-09-17 Marc-Antoine Ruel <maruel at chromium.org>
Reviewed by Dimitri Glazkov.
[Chromium] Split webcore_platform off webcore_remaining
Further reduce webcore_remaining size by moving platform/ code in its
own static libary.
https://bugs.webkit.org/show_bug.cgi?id=45915
* WebCore.gyp/WebCore.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67751 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3d9160..1dc709f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-17 Marc-Antoine Ruel <maruel at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [Chromium] Split webcore_platform off webcore_remaining
+
+ Further reduce webcore_remaining size by moving platform/ code in its
+ own static libary.
+ https://bugs.webkit.org/show_bug.cgi?id=45915
+
+ * WebCore.gyp/WebCore.gyp:
+
2010-09-13 Matt Perry <mpcomplete at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index a4b744b..2745cfa 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -995,7 +995,7 @@
],
},
{
- 'target_name': 'webcore_remaining',
+ 'target_name': 'webcore_platform',
'type': '<(library)',
'dependencies': [
'webcore_prerequisites',
@@ -1010,59 +1010,22 @@
'../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',
],
'sources/': [
- # Exclude JSC custom bindings.
- ['exclude', 'bindings/js'],
-
- # Fortunately, many things can be excluded by using broad patterns.
+ # Start by excluding everything then include platform files only.
+ ['exclude', '.*'],
+ ['include', 'platform/'],
# Exclude things that don't apply to the Chromium platform on the basis
# of their enclosing directories and tags at the ends of their
# filenames.
['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|linux|mac|opentype|posix|qt|soup|svg|symbian|win|wx)/'],
['exclude', '(?<!Chromium)(Android|Cairo|CF|CG|Curl|Gtk|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|Wx)\\.(cpp|mm?)$'],
- ['include', 'platform/graphics/opentype/OpenTypeSanitizer\\.cpp$'],
-
- # Exclude most of SVG except css and javascript bindings.
- ['exclude', 'rendering/style/SVG[^/]+.(cpp|h)$'],
- ['exclude', 'rendering/RenderSVG[^/]+.(cpp|h)$'],
- ['exclude', 'rendering/SVG[^/]+.(cpp|h)$'],
- # A few things can't be excluded by broad patterns.
- # List them individually.
+ # A few things can't be excluded by patterns. List them individually.
- # JSC-only.
- ['exclude', 'inspector/JavaScript[^/]*\\.cpp$'],
-
- # ENABLE_OFFLINE_WEB_APPLICATIONS, exclude most of webcore's impl
- ['exclude', 'loader/appcache/'],
- ['include', 'loader/appcache/ApplicationCacheHost\.h$'],
- ['include', 'loader/appcache/DOMApplicationCache\.(cpp|h)$'],
+ ['include', 'platform/graphics/opentype/OpenTypeSanitizer\\.cpp$'],
# Exclude some DB-related files.
['exclude', 'platform/sql/SQLiteFileSystem\\.cpp$'],
- ['exclude', 'storage/DatabaseTracker\\.cpp$'],
- ['exclude', 'storage/DatabaseTrackerClient\\.h$'],
- ['exclude', 'storage/OriginQuotaManager\\.(cpp|h)$'],
- ['exclude', 'storage/OriginUsageRecord\\.(cpp|h)$'],
- ['exclude', 'storage/SQLTransactionClient\\.cpp$'],
-
- # Don't build StorageNamespace. We have our own implementation.
- ['exclude', 'storage/StorageNamespace\\.cpp$'],
-
- # Don't build StorageEventDispatcher. We have our own implementation.
- ['exclude', 'storage/StorageEventDispatcher\\.cpp$'],
-
- # Don't build IDBFactoryBackendInterface. We have our own implementation.
- ['exclude', 'storage/IDBFactoryBackendInterface\\.cpp$'],
-
- # Don't build IDBKeyPathBackendImpl. We have our own implementation.
- ['exclude', 'storage/IDBKeyPathBackendImpl\\.cpp$'],
-
- # Use history/BackForwardListChromium.cpp instead.
- ['exclude', 'history/BackForwardListImpl\\.cpp$'],
-
- # Use loader/icon/IconDatabaseNone.cpp instead.
- ['exclude', 'loader/icon/IconDatabase\\.cpp$'],
# Use platform/KURLGoogle.cpp instead.
['exclude', 'platform/KURL\\.cpp$'],
@@ -1074,60 +1037,9 @@
# Windows and Linux. We manually include Theme.cpp for the Mac below.
['exclude', 'platform/Theme\\.cpp$'],
- # Exclude some, but not all, of plugins.
- ['exclude', 'plugins/PluginDatabase\\.cpp$'],
- ['exclude', 'plugins/PluginMainThreadScheduler\\.cpp$'],
- ['exclude', 'plugins/PluginPackage\\.cpp$'],
- ['exclude', 'plugins/PluginStream\\.cpp$'],
- ['exclude', 'plugins/PluginView\\.cpp$'],
- ['exclude', 'plugins/npapi\\.cpp$'],
-
# Use LinkHashChromium.cpp instead
['exclude', 'platform/LinkHash\\.cpp$'],
-
- # FIXME: I don't know exactly why these are excluded. It would
- # be nice to provide more explicit comments. Some of these do actually
- # compile.
- ['exclude', 'dom/StaticStringList\\.cpp$'],
- ['exclude', 'loader/icon/IconFetcher\\.cpp$'],
- ['exclude', 'loader/UserStyleSheetLoader\\.cpp$'],
-
- # We use a multi-process version from the WebKit API.
- ['exclude', 'dom/default/PlatformMessagePortChannel\\.(cpp|h)$'],
],
- 'link_settings': {
- 'mac_bundle_resources': [
- '../Resources/aliasCursor.png',
- '../Resources/cellCursor.png',
- '../Resources/contextMenuCursor.png',
- '../Resources/copyCursor.png',
- '../Resources/crossHairCursor.png',
- '../Resources/eastResizeCursor.png',
- '../Resources/eastWestResizeCursor.png',
- '../Resources/helpCursor.png',
- '../Resources/linkCursor.png',
- '../Resources/missingImage.png',
- '../Resources/moveCursor.png',
- '../Resources/noDropCursor.png',
- '../Resources/noneCursor.png',
- '../Resources/northEastResizeCursor.png',
- '../Resources/northEastSouthWestResizeCursor.png',
- '../Resources/northResizeCursor.png',
- '../Resources/northSouthResizeCursor.png',
- '../Resources/northWestResizeCursor.png',
- '../Resources/northWestSouthEastResizeCursor.png',
- '../Resources/notAllowedCursor.png',
- '../Resources/progressCursor.png',
- '../Resources/southEastResizeCursor.png',
- '../Resources/southResizeCursor.png',
- '../Resources/southWestResizeCursor.png',
- '../Resources/verticalTextCursor.png',
- '../Resources/waitCursor.png',
- '../Resources/westResizeCursor.png',
- '../Resources/zoomInCursor.png',
- '../Resources/zoomOutCursor.png',
- ],
- },
'conditions': [
['OS=="linux" or OS=="freebsd"', {
'sources/': [
@@ -1228,10 +1140,6 @@
# by regex above, instead.
['exclude', 'platform/graphics/ImageSource\\.cpp$'],
- # RenderThemeChromiumSkia is not used on mac since RenderThemeChromiumMac
- # does not reference the Skia code that is used by Windows and Linux.
- ['exclude', 'rendering/RenderThemeChromiumSkia\\.cpp$'],
-
# Skia image-decoders are also not used on mac. CoreGraphics
# is used directly instead.
['exclude', 'platform/image-decoders/ImageDecoder\\.h$'],
@@ -1249,6 +1157,143 @@
['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
],
}],
+ ['OS!="linux" and OS!="freebsd"', {
+ 'sources/': [
+ ['exclude', '(Gtk|Linux)\\.cpp$'],
+ ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
+ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
+ ],
+ }],
+ ['OS!="mac"', {
+ 'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
+ }],
+ ['OS!="win"', {
+ 'sources/': [
+ ['exclude', 'Win\\.cpp$'],
+ ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
+ ],
+ }],
+ ['OS=="win"', {
+ 'sources/': [
+ ['exclude', 'Posix\\.cpp$'],
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'webcore_remaining',
+ 'type': '<(library)',
+ 'dependencies': [
+ 'webcore_prerequisites',
+ ],
+ # This is needed for mac because of webkit_system_interface. It'd be nice
+ # if this hard dependency could be split off the rest.
+ 'hard_dependency': 1,
+ 'sources': [
+ '<@(webcore_files)',
+ ],
+ 'sources/': [
+ # Exclude JSC custom bindings.
+ ['exclude', 'bindings/js'],
+
+ # Fortunately, many things can be excluded by using broad patterns.
+
+ # Exclude things that don't apply to the Chromium platform on the basis
+ # of their enclosing directories and tags at the ends of their
+ # filenames.
+ ['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|linux|mac|opentype|platform|posix|qt|soup|svg|symbian|win|wx)/'],
+ ['exclude', '(?<!Chromium)(Android|Cairo|CF|CG|Curl|Gtk|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|Wx)\\.(cpp|mm?)$'],
+
+ # Exclude most of SVG except css and javascript bindings.
+ ['exclude', 'rendering/style/SVG[^/]+.(cpp|h)$'],
+ ['exclude', 'rendering/RenderSVG[^/]+.(cpp|h)$'],
+ ['exclude', 'rendering/SVG[^/]+.(cpp|h)$'],
+
+ # JSC-only.
+ ['exclude', 'inspector/JavaScript[^/]*\\.cpp$'],
+
+ # ENABLE_OFFLINE_WEB_APPLICATIONS, exclude most of webcore's impl
+ ['exclude', 'loader/appcache/'],
+ ['include', 'loader/appcache/ApplicationCacheHost\.h$'],
+ ['include', 'loader/appcache/DOMApplicationCache\.(h|cpp)$'],
+
+ # Exclude some DB-related files.
+ ['exclude', 'storage/DatabaseTracker\\.cpp$'],
+ ['exclude', 'storage/DatabaseTrackerClient\\.h$'],
+ ['exclude', 'storage/OriginQuotaManager\\.(cpp|h)$'],
+ ['exclude', 'storage/OriginUsageRecord\\.(cpp|h)$'],
+ ['exclude', 'storage/SQLTransactionClient\\.cpp$'],
+
+ # Don't build StorageNamespace. We have our own implementation.
+ ['exclude', 'storage/StorageNamespace\\.cpp$'],
+
+ # Don't build StorageEventDispatcher. We have our own implementation.
+ ['exclude', 'storage/StorageEventDispatcher\\.cpp$'],
+
+ # Don't build IDBFactoryBackendInterface. We have our own implementation.
+ ['exclude', 'storage/IDBFactoryBackendInterface\\.cpp$'],
+
+ # Don't build IDBKeyPathBackendImpl. We have our own implementation.
+ ['exclude', 'storage/IDBKeyPathBackendImpl\\.cpp$'],
+
+ # Use history/BackForwardListChromium.cpp instead.
+ ['exclude', 'history/BackForwardListImpl\\.cpp$'],
+
+ # Use loader/icon/IconDatabaseNone.cpp instead.
+ ['exclude', 'loader/icon/IconDatabase\\.cpp$'],
+
+ # Exclude some, but not all, of plugins.
+ ['exclude', 'plugins/PluginDatabase\\.cpp$'],
+ ['exclude', 'plugins/PluginMainThreadScheduler\\.cpp$'],
+ ['exclude', 'plugins/PluginPackage\\.cpp$'],
+ ['exclude', 'plugins/PluginStream\\.cpp$'],
+ ['exclude', 'plugins/PluginView\\.cpp$'],
+ ['exclude', 'plugins/npapi\\.cpp$'],
+
+ # FIXME: I don't know exactly why these are excluded. It would
+ # be nice to provide more explicit comments. Some of these do actually
+ # compile.
+ ['exclude', 'dom/StaticStringList\\.cpp$'],
+ ['exclude', 'loader/icon/IconFetcher\\.cpp$'],
+ ['exclude', 'loader/UserStyleSheetLoader\\.cpp$'],
+
+ # We use a multi-process version from the WebKit API.
+ ['exclude', 'dom/default/PlatformMessagePortChannel\\.(cpp|h)$'],
+ ],
+ 'link_settings': {
+ 'mac_bundle_resources': [
+ '../Resources/aliasCursor.png',
+ '../Resources/cellCursor.png',
+ '../Resources/contextMenuCursor.png',
+ '../Resources/copyCursor.png',
+ '../Resources/crossHairCursor.png',
+ '../Resources/eastResizeCursor.png',
+ '../Resources/eastWestResizeCursor.png',
+ '../Resources/helpCursor.png',
+ '../Resources/linkCursor.png',
+ '../Resources/missingImage.png',
+ '../Resources/moveCursor.png',
+ '../Resources/noDropCursor.png',
+ '../Resources/noneCursor.png',
+ '../Resources/northEastResizeCursor.png',
+ '../Resources/northEastSouthWestResizeCursor.png',
+ '../Resources/northResizeCursor.png',
+ '../Resources/northSouthResizeCursor.png',
+ '../Resources/northWestResizeCursor.png',
+ '../Resources/northWestSouthEastResizeCursor.png',
+ '../Resources/notAllowedCursor.png',
+ '../Resources/progressCursor.png',
+ '../Resources/southEastResizeCursor.png',
+ '../Resources/southResizeCursor.png',
+ '../Resources/southWestResizeCursor.png',
+ '../Resources/verticalTextCursor.png',
+ '../Resources/waitCursor.png',
+ '../Resources/westResizeCursor.png',
+ '../Resources/zoomInCursor.png',
+ '../Resources/zoomOutCursor.png',
+ ],
+ },
+ 'conditions': [
['OS=="win"', {
'sources/': [
['exclude', 'Posix\\.cpp$'],
@@ -1259,11 +1304,16 @@
['include', '/TransparencyWin\\.cpp$'],
],
}],
+ ['OS=="mac"', {
+ 'sources/': [
+ # RenderThemeChromiumSkia is not used on mac since RenderThemeChromiumMac
+ # does not reference the Skia code that is used by Windows and Linux.
+ ['exclude', 'rendering/RenderThemeChromiumSkia\\.cpp$'],
+ ],
+ }],
['OS!="linux" and OS!="freebsd"', {
'sources/': [
['exclude', '(Gtk|Linux)\\.cpp$'],
- ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
- ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
}],
['OS!="mac"', {
@@ -1281,6 +1331,7 @@
'target_name': 'webcore',
'type': 'none',
'dependencies': [
+ 'webcore_platform',
'webcore_remaining',
# Exported.
'webcore_bindings',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list