Diff
Modified: trunk/Source/WebCore/ChangeLog (143853 => 143854)
--- trunk/Source/WebCore/ChangeLog 2013-02-23 23:33:40 UTC (rev 143853)
+++ trunk/Source/WebCore/ChangeLog 2013-02-24 00:17:03 UTC (rev 143854)
@@ -1,3 +1,15 @@
+2013-02-23 Kentaro Hara <[email protected]>
+
+ Unreviewed, rolling out r143844.
+ http://trac.webkit.org/changeset/143844
+ https://bugs.webkit.org/show_bug.cgi?id=110241
+
+ It broke Chromium Mac Release Build
+
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gyp/WebCoreGTK.gyp: Removed.
+ * WebCore.gypi:
+
2013-02-23 Adam Barth <[email protected]>
WebCore fails to link in Chromium official build
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (143853 => 143854)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-02-23 23:33:40 UTC (rev 143853)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-02-24 00:17:03 UTC (rev 143854)
@@ -49,29 +49,113 @@
'enable_wexit_time_destructors': 1,
'webcore_include_dirs': [
- '../bindings/v8',
- '../bindings/v8/custom',
- '../bridge/jni/v8',
- '../Modules/filesystem/chromium',
- '../Modules/indexeddb/chromium',
- '../Modules/webdatabase/chromium',
- '../accessibility/chromium',
- '../dom/default/chromium',
- '../page/chromium',
- '../page/scrolling/chromium',
- '../platform/audio/chromium',
- '../platform/chromium',
- '../platform/chromium/support',
- '../platform/graphics/chromium',
- '../platform/graphics/chromium/cc',
- '../platform/graphics/filters/skia',
- '../platform/graphics/skia',
- '../platform/mediastream/chromium',
- '../platform/network/chromium',
- '../plugins/chromium',
- '../workers/chromium',
- '../../ThirdParty/glu',
- '<@(shared_webcore_include_dirs)',
+ '../',
+ '../..',
+ '../Modules/battery',
+ '../Modules/filesystem',
+ '../Modules/filesystem/chromium',
+ '../Modules/gamepad',
+ '../Modules/geolocation',
+ '../Modules/indexeddb',
+ '../Modules/indexeddb/chromium',
+ '../Modules/mediasource',
+ '../Modules/mediastream',
+ '../Modules/navigatorcontentutils',
+ '../Modules/notifications',
+ '../Modules/proximity',
+ '../Modules/quota',
+ '../Modules/speech',
+ '../Modules/webaudio',
+ '../Modules/webdatabase',
+ '../Modules/webdatabase/chromium',
+ '../Modules/websockets',
+ '../accessibility',
+ '../accessibility/chromium',
+ '../bindings',
+ '../bindings/generic',
+ '../bindings/v8',
+ '../bindings/v8/custom',
+ '../bridge',
+ '../bridge/jni',
+ '../bridge/jni/v8',
+ '../css',
+ '../dom',
+ '../dom/default',
+ '../dom/default/chromium',
+ '../editing',
+ '../fileapi',
+ '../history',
+ '../html',
+ '../html/canvas',
+ '../html/parser',
+ '../html/shadow',
+ '../html/track',
+ '../inspector',
+ '../loader',
+ '../loader/appcache',
+ '../loader/archive',
+ '../loader/archive/cf',
+ '../loader/archive/mhtml',
+ '../loader/cache',
+ '../loader/icon',
+ '../mathml',
+ '../page',
+ '../page/animation',
+ '../page/chromium',
+ '../page/scrolling',
+ '../page/scrolling/chromium',
+ '../platform',
+ '../platform/animation',
+ '../platform/audio',
+ '../platform/audio/chromium',
+ '../platform/chromium',
+ '../platform/chromium/support',
+ '../platform/graphics',
+ '../platform/graphics/chromium',
+ '../platform/graphics/chromium/cc',
+ '../platform/graphics/cpu/arm',
+ '../platform/graphics/cpu/arm/filters',
+ '../platform/graphics/filters',
+ '../platform/graphics/filters/skia',
+ '../platform/graphics/gpu',
+ '../platform/graphics/opentype',
+ '../platform/graphics/skia',
+ '../platform/graphics/transforms',
+ '../platform/image-decoders',
+ '../platform/image-decoders/bmp',
+ '../platform/image-decoders/gif',
+ '../platform/image-decoders/ico',
+ '../platform/image-decoders/jpeg',
+ '../platform/image-decoders/png',
+ '../platform/image-decoders/skia',
+ '../platform/image-decoders/webp',
+ '../platform/image-encoders/skia',
+ '../platform/leveldb',
+ '../platform/mediastream',
+ '../platform/mediastream/chromium',
+ '../platform/mock',
+ '../platform/network',
+ '../platform/network/chromium',
+ '../platform/sql',
+ '../platform/text',
+ '../platform/text/transcoder',
+ '../plugins',
+ '../plugins/chromium',
+ '../rendering',
+ '../rendering/mathml',
+ '../rendering/style',
+ '../rendering/svg',
+ '../storage',
+ '../svg',
+ '../svg/animation',
+ '../svg/graphics',
+ '../svg/graphics/filters',
+ '../svg/properties',
+ '../../ThirdParty/glu',
+ '../workers',
+ '../workers/chromium',
+ '../xml',
+ '../xml/parser',
],
'bindings_idl_files': [
Deleted: trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp (143853 => 143854)
--- trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp 2013-02-23 23:33:40 UTC (rev 143853)
+++ trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp 2013-02-24 00:17:03 UTC (rev 143854)
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2009 Google Inc. All rights reserved.
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-{
- 'includes': [
- '../WebCore.gypi',
- ],
-
- 'variables': {
- 'webcore_include_dirs': [
- '<@(shared_webcore_include_dirs)',
- '../accessibility/atk',
- '../bindings/js',
- '../bridge/jsc',
- '../loader/gtk',
- '../page/gtk',
- '../platform/audio/gstreamer',
- '../platform/cairo',
- '../platform/geoclue',
- '../platform/graphics/cairo',
- '../platform/graphics/egl',
- '../platform/graphics/freetype',
- '../platform/graphics/glx',
- '../platform/graphics/gstreamer',
- '../platform/graphics/gtk',
- '../platform/graphics/harfbuzz',
- '../platform/graphics/harfbuzz',
- '../platform/graphics/harfbuzz/ng',
- '../platform/graphics/harfbuzz/ng',
- '../platform/graphics/opengl',
- '../platform/gtk',
- '../platform/linux',
- '../platform/network/gtk',
- '../platform/network/soup',
- '../platform/text/encha',
- '../plugins/win',
- ],
- },
-}
-
Modified: trunk/Source/WebCore/WebCore.gypi (143853 => 143854)
--- trunk/Source/WebCore/WebCore.gypi 2013-02-23 23:33:40 UTC (rev 143853)
+++ trunk/Source/WebCore/WebCore.gypi 2013-02-24 00:17:03 UTC (rev 143854)
@@ -1,93 +1,6 @@
{
'variables': {
'project_dir': ['.'],
- 'shared_webcore_include_dirs': [
- '.',
- '..',
- 'Modules/battery',
- 'Modules/filesystem',
- 'Modules/gamepad',
- 'Modules/geolocation',
- 'Modules/indexeddb',
- 'Modules/mediasource',
- 'Modules/mediastream',
- 'Modules/navigatorcontentutils',
- 'Modules/notifications',
- 'Modules/proximity',
- 'Modules/quota',
- 'Modules/speech',
- 'Modules/webaudio',
- 'Modules/webdatabase',
- 'Modules/websockets',
- 'accessibility',
- 'bindings',
- 'bindings/generic',
- 'bridge',
- 'bridge/jni',
- 'css',
- 'dom',
- 'dom/default',
- 'editing',
- 'fileapi',
- 'history',
- 'html',
- 'html/canvas',
- 'html/parser',
- 'html/shadow',
- 'html/track',
- 'inspector',
- 'loader',
- 'loader/appcache',
- 'loader/archive',
- 'loader/archive/cf',
- 'loader/archive/mhtml',
- 'loader/cache',
- 'loader/icon',
- 'mathml',
- 'page',
- 'page/animation',
- 'page/scrolling',
- 'platform',
- 'platform/animation',
- 'platform/audio',
- 'platform/graphics',
- 'platform/graphics/cpu/arm',
- 'platform/graphics/cpu/arm/filters',
- 'platform/graphics/filters',
- 'platform/graphics/gpu',
- 'platform/graphics/opentype',
- 'platform/graphics/transforms',
- 'platform/image-decoders',
- 'platform/image-decoders/bmp',
- 'platform/image-decoders/gif',
- 'platform/image-decoders/ico',
- 'platform/image-decoders/jpeg',
- 'platform/image-decoders/png',
- 'platform/image-decoders/skia',
- 'platform/image-decoders/webp',
- 'platform/image-encoders/skia',
- 'platform/leveldb',
- 'platform/mediastream',
- 'platform/mock',
- 'platform/network',
- 'platform/sql',
- 'platform/text',
- 'platform/text/transcoder',
- 'plugins',
- 'rendering',
- 'rendering/mathml',
- 'rendering/style',
- 'rendering/svg',
- 'storage',
- 'svg',
- 'svg/animation',
- 'svg/graphics',
- 'svg/graphics/filters',
- 'svg/properties',
- 'workers',
- 'xml',
- 'xml/parser',
- ],
'webcore_bindings_idl_files': [
'Modules/battery/BatteryManager.idl',
'Modules/battery/NavigatorBattery.idl',
