diff options
| -rw-r--r-- | third_party/libxml/SConscript | 1 | ||||
| -rw-r--r-- | webkit/SConscript | 105 | ||||
| -rw-r--r-- | webkit/SConscript.javascriptcore_pcre | 4 | ||||
| -rw-r--r-- | webkit/SConscript.port | 173 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 23 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 81 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 342 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 112 |
8 files changed, 559 insertions, 282 deletions
diff --git a/third_party/libxml/SConscript b/third_party/libxml/SConscript index 3a0c00a..8be5f47 100644 --- a/third_party/libxml/SConscript +++ b/third_party/libxml/SConscript @@ -36,7 +36,6 @@ env.Prepend( '$ICU38_DIR/public/common', '$ICU38_DIR/public/18n', '$ZLIB_DIR', - 'scons', 'scons/include', 'include', ], diff --git a/webkit/SConscript b/webkit/SConscript index 0f63834..7ee1021 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -10,12 +10,35 @@ env = env.Clone() env_res = env.Clone() -port_dir = env.Dir('#/$BUILD_TYPE/webkit/port') - +# We use the SCons addRepository() call (an internal API that will +# at some point be made public) to "back" the build directory +# hierarchy with the source directory hierarchies in which we want to +# find the source .cpp and .h files. Think of this kind of like +# Make's VPATH, but applied to entire directory hierarchies. The +# upshot is that when searching for any file (source or target), +# SCons will search the subdirectory hierarchies under the following +# paths: +# +# webkit/Hammer/port/ +# webkit/port/ +# third_party/WebKit/WebCore +# +# SCons will replicate the compiler and linker -I and -L options so +# that the tools will find the right .h and library files. This comes +# at the cost of tripling the number of -I or -L options on a command +# line, but with the benefit that the build should "just work" +# regardless of which tree the file lives in, and regardless of whether +# or not the file involved is a generated file or checked-in source. + +port_dir = env.Dir('$WEBKIT_DIR/port') port_dir.addRepository(env.Dir('#/../webkit/port')) port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore')) -if env['PLATFORM'] == 'posix': +if env['PLATFORM'] == 'win32': + env['WEBKIT_PLATFORM_DIR'] = 'win' +elif env['PLATFORM'] == 'darwin': + env['WEBKIT_PLATFORM_DIR'] = 'mac' +elif env['PLATFORM'] == 'posix': env.Append( CCFLAGS = [ '-Wno-parentheses', @@ -29,14 +52,27 @@ env.Prepend( CPPPATH = [ '$WEBKIT_DIR/build/localized_strings', '$WEBKIT_DIR/build/JSConfig/WebCore', + '$WEBKIT_DIR/build/JavaScriptCore', '$WEBKIT_DIR/build/WebCore', + + '$WEBKIT_DIR/port/platform/image-decoders', + '$WEBKIT_DIR/port/platform/image-decoders/bmp', + '$WEBKIT_DIR/port/platform/image-decoders/gif', + '$WEBKIT_DIR/port/platform/image-decoders/ico', + '$WEBKIT_DIR/port/platform/image-decoders/jpeg', + '$WEBKIT_DIR/port/platform/image-decoders/png', + '$WEBKIT_DIR/port/platform/image-decoders/xbm', + '$ZLIB_DIR', + '$LIBPNG_DIR', + '$LIBJPEG_DIR', + '$LIBXSLT_DIR', + '$LIBXML_DIR/include', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', '$NPAPI_DIR', - '$V8_DIR/src/api', '$V8_DIR/include', '$WEBKIT_DIR/V8Bindings/DerivedSources', '$WEBKIT_DIR/V8Bindings/SharedSources', @@ -54,48 +90,39 @@ env.Prepend( '$WEBKIT_DIR/port/history', '$WEBKIT_DIR/port/html', '$WEBKIT_DIR/port/loader', + '$WEBKIT_DIR/port/loader/appcache', + '$WEBKIT_DIR/port/loader/archive', '$WEBKIT_DIR/port/loader/icon', '$WEBKIT_DIR/port/page', + '$WEBKIT_DIR/port/page/animation', '$WEBKIT_DIR/port/platform', + '$WEBKIT_DIR/port/platform/graphics', + '$WEBKIT_DIR/port/platform/$WEBKIT_PLATFORM_DIR', + '$WEBKIT_DIR/port/svg/graphics', '$WEBKIT_DIR/port/platform/network', + '$WEBKIT_DIR/port/platform/network/win', + '$WEBKIT_DIR/port/platform/sql', '$WEBKIT_DIR/port/platform/text', '$WEBKIT_DIR/port/plugins', '$WEBKIT_DIR/port/rendering', + '$WEBKIT_DIR/port/rendering/style', + '$WEBKIT_DIR/port/storage', + '$WEBKIT_DIR/port/style', + '$WEBKIT_DIR/port/xml', '$WEBKIT_DIR', + '$WEBKIT_DIR/build/port', - '$WEBKIT_DIR/port/platform/image-decoders', - '$WEBKIT_DIR/port/platform/image-decoders/bmp', - '$WEBKIT_DIR/port/platform/image-decoders/gif', - '$WEBKIT_DIR/port/platform/image-decoders/ico', - '$WEBKIT_DIR/port/platform/image-decoders/jpeg', - '$WEBKIT_DIR/port/platform/image-decoders/png', - '$WEBKIT_DIR/port/platform/image-decoders/xbm', - '$WEBKIT_DIR/port/platform/image-decoders/zlib', + '$JAVASCRIPTCORE_DIR', + '$JAVASCRIPTCORE_DIR/wtf', + '$JAVASCRIPTCORE_DIR/os-win32', - '$WEBKIT_DIR/port/platform/graphics', + '$WEBKIT_DIR/build', - '$WEBKIT_DIR/port/svg/graphics', - '$WEBKIT_DIR/port/platform/network', - '$WEBKIT_DIR/port/platform/sql', - '$WEBKIT_DIR/port/platform/network/win', - '$WEBKIT_DIR/port/rendering', - '$WEBKIT_DIR/port/storage', - '$WEBKIT_DIR/port/xml', - '$WEBKIT_DIR/port', - '$WEBKIT_DIR/port/wtf', - '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore', - '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/wtf', + '$WEBKIT_DIR/port/DerivedSources', '$WEBKIT_DIR/port/svg', + '$WEBKIT_DIR/port/svg/animation', '$WEBKIT_DIR/port/svg/graphics/filters', - '$WEBKIT_DIR/port/plugins', - '$LIBXSLT_DIR/scons', - '$LIBXSLT_DIR', - '$LIBXML_DIR/scons/include', - '$LIBXML_DIR/include', - '$LIBPNG_DIR', - '$ZLIB_DIR', - '$LIBJPEG_DIR', - '$WEBKIT_DIR/DerivedSources', + '#/..', ], ) @@ -127,22 +154,23 @@ env.Append( 'U_STATIC_IMPLEMENTATION', '_SCL_SECURE_NO_DEPRECATE', '_SCL_SECURE_NO_WARNINGS', - ['ENABLE_CROSS_DOCUMENT_MESSAGING', '1'], + ['ENABLE_DATABASE', '0'], + ['ENABLE_DASHBOARD_SUPPORT', '0'], + ['ENABLE_JSC_MULTIPLE_THREADS', '0'], + ['ENABLE_ICONDATABASE', '0'], ['ENABLE_XSLT', '1'], ['ENABLE_XPATH', '1'], ['ENABLE_SVG', '1'], + ['ENABLE_SVG_ANIMATION', '1'], ['ENABLE_SVG_AS_IMAGE', '1'], ['ENABLE_SVG_USE', '1'], ['ENABLE_SVG_FOREIGN_OBJECT', '1'], ['ENABLE_SVG_FONTS', '1'], - ['ANDROID_CANVAS_IMPL', '1'], ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'], 'USE_GOOGLE_URL_LIBRARY', - 'BUILDING_CHROMIUM__', + ['BUILDING_CHROMIUM__', '1'], 'CHROMIUM_BUILD', - 'WTF_USE_ICU_UNICODE', '_SECURE_ATL', - 'QNAME_DEFAULT_CONSTRUCTOR', 'LIBXSLT_STATIC', 'LIBXML_STATIC', @@ -152,6 +180,7 @@ env.Append( 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', '__STD_C', + ['USE_SYSTEM_MALLOC', '1'], ], ) diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index d13267c..2bd4aa0 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -39,7 +39,9 @@ input_files = [ '$PCRE_DIR/pcre_xclass.cpp', '$PCRE_DIR/pcre_ucp_searchfuncs.cpp', '$PCRE_DIR/pcre_tables.cpp', - '$PCRE_DIR/pcre_exec.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$PCRE_DIR/pcre_exec.cpp', + '$PENDING_DIR/pcre_exec.cpp', ] env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files) diff --git a/webkit/SConscript.port b/webkit/SConscript.port index bd4da3f..4b5702a 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -6,6 +6,8 @@ Import('env') env = env.Clone() +env.Append() + if env['PLATFORM'] == 'win32': env.Prepend( CCFLAGS = [ @@ -21,52 +23,113 @@ elif env['PLATFORM'] == 'posix': env.Append( # For the image readers and decoders: CXXFLAGS = "-Wno-sign-compare", + LIBS = 'libpng' ) input_files = [ - '$PORT_DIR/css/RGBColor.cpp', - '$PORT_DIR/history/BackForwardList.cpp', - '$PORT_DIR/history/CachedPage.cpp', - '$PORT_DIR/loader/IconLoader.cpp', - '$PORT_DIR/platform/Language.cpp', - '$PORT_DIR/platform/TemporaryLinkStubs.cpp', - '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp', - '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp', - '$PORT_DIR/platform/graphics/NativeImageSkia.cpp', - '$PORT_DIR/platform/graphics/PathSkia.cpp', - '$PORT_DIR/platform/graphics/SkPaintContext.cpp', - '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp', - '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp', - '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp', - '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp', - '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp', - '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp', - '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp', - '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp', - '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp', + '$PORT_DIR/css/RGBColor.cpp', + + '$PORT_DIR/history/BackForwardList.cpp', + '$PORT_DIR/history/CachedPage.cpp', + + '$PORT_DIR/loader/IconLoader.cpp', + '$PORT_DIR/loader/IconDatabaseNone.cpp', + + '$PORT_DIR/page/Console.cpp', + '$PORT_DIR/page/Location.cpp', + '$PORT_DIR/page/Navigator.cpp', + + '$PORT_DIR/platform/BString.cpp', + '$PORT_DIR/platform/FramelessScrollView.cpp', + '$PORT_DIR/platform/GKURL.cpp', + '$PORT_DIR/platform/Language.cpp', + '$PORT_DIR/platform/TemporaryLinkStubs.cpp', + '$PORT_DIR/platform/UniscribeStateTextRun.cpp', + '$PORT_DIR/platform/WCDataObject.cpp', + + '$PORT_DIR/platform/graphics/AffineTransformSkia.cpp', + '$PORT_DIR/platform/graphics/ColorSkia.cpp', + '$PORT_DIR/platform/graphics/FloatPointSkia.cpp', + '$PORT_DIR/platform/graphics/FloatRectSkia.cpp', + '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', + '$PORT_DIR/platform/graphics/GradientSkia.cpp', + '$PORT_DIR/platform/graphics/GraphicsContextPlatformPrivate.cpp', + '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp', + '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp', + '$PORT_DIR/platform/graphics/ImageSkia.cpp', + '$PORT_DIR/platform/graphics/ImageSourceSkia.cpp', + '$PORT_DIR/platform/graphics/IntPointSkia.cpp', + '$PORT_DIR/platform/graphics/IntRectSkia.cpp', + '$PORT_DIR/platform/graphics/NativeImageSkia.cpp', + '$PORT_DIR/platform/graphics/PathSkia.cpp', + '$PORT_DIR/platform/graphics/PatternSkia.cpp', + '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp', + '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp', + '$PORT_DIR/platform/graphics/SkiaUtils.cpp', + '$PORT_DIR/platform/graphics/SkPaintContext.cpp', + + '$PORT_DIR/platform/graphics/svg/RenderPathSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SkiaSupport.cpp', + '$PORT_DIR/platform/graphics/svg/SVGPaintServerGradientSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp', + '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp', + + '$PORT_DIR/platform/image-decoders/bmp/BMPImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/bmp/BMPImageReader.cpp', + '$PORT_DIR/platform/image-decoders/gif/GIFImageDecoder.cpp', + #'$PENDING_DIR/GIFImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/gif/GIFImageReader.cpp', + '$PORT_DIR/platform/image-decoders/ico/ICOImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/jpeg/JPEGImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/png/PNGImageDecoder.cpp', + '$PORT_DIR/platform/image-decoders/xbm/XBMImageDecoder.cpp', + + '$PORT_DIR/platform/network/AuthenticationChallenge.cpp', + '$PORT_DIR/platform/network/DNS.cpp', + + '$PORT_DIR/plugins/PluginDataChromium.cpp', ] +if env['PLATFORM'] in ('posix', 'darwin'): + # Remove from the list files that haven't yet been made portable + # to Mac and Linux. + remove_files = [ + '$PORT_DIR/page/Console.cpp', + '$PORT_DIR/page/Location.cpp', + '$PORT_DIR/page/Navigator.cpp', + '$PORT_DIR/platform/BString.cpp', + '$PORT_DIR/platform/FramelessScrollView.cpp', + '$PORT_DIR/platform/GKURL.cpp', + '$PORT_DIR/platform/UniscribeStateTextRun.cpp', + '$PORT_DIR/platform/WCDataObject.cpp', + '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', + '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp', + '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp', + '$PORT_DIR/platform/graphics/ImageSkia.cpp', + '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp', + '$PORT_DIR/platform/graphics/SkiaUtils.cpp', + '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp', + '$PORT_DIR/platform/network/AuthenticationChallenge.cpp', + '$PORT_DIR/platform/network/DNS.cpp', + '$PORT_DIR/plugins/PluginDataChromium.cpp', + ] + for remove in remove_files: + input_files.remove(remove) + if env['PLATFORM'] == 'win32': - # These files aren't win32-specific, they're just files that haven't yet been - # made portable. + # These are win32 specific and will never be ported. input_files.extend([ '$PORT_DIR/bridge/FrameWin.cpp', - '$PORT_DIR/bridge/HistoryWin.cpp', '$PORT_DIR/bridge/PageWin.cpp', '$PORT_DIR/bridge/PluginsWin.cpp', - '$PORT_DIR/loader/IconDatabaseNone.cpp', + '$PORT_DIR/page/AccessibilityObjectWin.cpp', '$PORT_DIR/page/AXObjectCacheWin.cpp', '$PORT_DIR/page/DragControllerWin.cpp', '$PORT_DIR/page/EventHandlerWin.cpp', - '$PORT_DIR/platform/BString.cpp', '$PORT_DIR/platform/ClipboardUtilitiesWin.cpp', '$PORT_DIR/platform/ClipboardWin.cpp', '$PORT_DIR/platform/ContextMenuItemWin.cpp', @@ -76,8 +139,6 @@ if env['PLATFORM'] == 'win32': '$PORT_DIR/platform/DragImageWin.cpp', '$PORT_DIR/platform/EditorWin.cpp', '$PORT_DIR/platform/FileChooserWin.cpp', - '$PORT_DIR/platform/FramelessScrollView.cpp', - '$PORT_DIR/platform/GKURL.cpp', '$PORT_DIR/platform/KeyEventWin.cpp', '$PORT_DIR/platform/LogWin.cpp', '$PORT_DIR/platform/MimeTypeRegistryWin.cpp', @@ -94,34 +155,46 @@ if env['PLATFORM'] == 'win32': '$PORT_DIR/platform/SystemTimeWin.cpp', '$PORT_DIR/platform/TextBoundariesWin.cpp', '$PORT_DIR/platform/TextBreakIteratorInternalICUWin.cpp', - '$PORT_DIR/platform/UniscribeStateTextRun.cpp', - '$PORT_DIR/platform/WCDataObject.cpp', '$PORT_DIR/platform/WheelEventWin.cpp', '$PORT_DIR/platform/WidgetWin.cpp', '$PORT_DIR/platform/graphics/FontCacheWin.cpp', - '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp', '$PORT_DIR/platform/graphics/FontPlatformDataWin.cpp', '$PORT_DIR/platform/graphics/FontWin.cpp', '$PORT_DIR/platform/graphics/GlyphPageTreeNodeWin.cpp', - '$PORT_DIR/platform/graphics/GraphicsContextPrivate.cpp', - '$PORT_DIR/platform/graphics/GraphicsContextSkia.cpp', '$PORT_DIR/platform/graphics/IconWin.cpp', - '$PORT_DIR/platform/graphics/ImageBufferSkia.cpp', - '$PORT_DIR/platform/graphics/ImageSkia.cpp', - '$PORT_DIR/platform/graphics/PlatformContextSkia.cpp', + '$PORT_DIR/platform/graphics/IntPointWin.cpp', + '$PORT_DIR/platform/graphics/IntRectWin.cpp', + '$PORT_DIR/platform/graphics/IntSizeWin.cpp', '$PORT_DIR/platform/graphics/SimpleFontDataWin.cpp', - '$PORT_DIR/platform/graphics/SkiaUtils.cpp', - '$PORT_DIR/platform/graphics/SkGraphicsContext.cpp', '$PORT_DIR/platform/network/CookieJarWin.cpp', + '$PORT_DIR/platform/network/NetworkStateNotifierWin.cpp', '$PORT_DIR/rendering/RenderThemeWin.cpp', ]) -if env['PLATFORM'] == 'win32': - # These are extremely win32 specific and will never be ported. +if env['PLATFORM'] == 'darwin': input_files.extend([ - '$PORT_DIR/platform/graphics/IntPointWin.cpp', - '$PORT_DIR/platform/graphics/IntRectWin.cpp', - '$PORT_DIR/platform/graphics/IntSizeWin.cpp', + '$PORT_DIR/bridge/mac/FrameMac.mm', + '$PORT_DIR/page/EventHandlerMac.mm', + '$PORT_DIR/page/WebCoreFrameBridge.mm', + '$PORT_DIR/platform/GKURLMac.mm', + '$PORT_DIR/platform/PluginStubsMac.cpp', + '$PORT_DIR/platform/mac/ClipboardMac.mm', + '$PORT_DIR/platform/mac/DragDataMac.mm', + '$PORT_DIR/platform/mac/IntRectMac.mm', + '$PORT_DIR/platform/mac/PasteboardMac.mm', + '$PORT_DIR/platform/mac/ScrollViewMac.mm', + '$PORT_DIR/platform/graphics/mac/FontCacheMacPending.cpp', + '$PORT_DIR/rendering/RenderThemeMac.mm', + ]) + +if env.get('KJS'): + input_files.extend([ + '$PORT_DIR/bridge/ScriptControllerKJS.cpp', + ]) +else: + input_files.extend([ + '$PORT_DIR/bridge/ScriptControllerV8.cpp', + '$PORT_DIR/bridge/ExceptionContextV8.cpp', ]) env.ChromeStaticLibrary("port", input_files) diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 97534f7..5b15591 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -117,8 +117,11 @@ env.Append( CPPDEFINES = [ '__STD_C', 'U_STATIC_IMPLEMENTATION', - ] - ) + ], + CPPPATH = [ + '$WTF_DIR/unicode', + ], +) if env['PLATFORM'] == 'win32': env.Append( @@ -136,7 +139,6 @@ if env['PLATFORM'] == 'win32': CCFLAGS = [ '/TP', - '/WX', '/Wp64', '/wd4127', @@ -150,10 +152,19 @@ if env['PLATFORM'] == 'win32': wtf_inputs = [ '$WTF_DIR/Assertions.cpp', - '$WTF_DIR/unicode/UTF8.cpp', - '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', + '$WTF_DIR/MainThread.cpp', + '$WTF_DIR/RefCountedLeakCounter.cpp', + '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/unicode/UTF8.cpp', + '$WTF_DIR/unicode/icu/CollatorICU.cpp', ] -env.ChromeStaticLibrary('WTF', wtf_inputs) +if env['PLATFORM'] == 'win32': + wtf_inputs.extend([ + '$WTF_DIR/win/MainThreadWin.cpp', + '$PENDING_DIR/wtf/ThreadingWin.cpp', + ]) +env.ChromeStaticLibrary('WTF', wtf_inputs) diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index ae26a5f..7601beae 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -39,6 +39,7 @@ if env['PLATFORM'] == 'posix': inputs = [ '$SHARED_DIR/PausedTimeouts.cpp', + '$DERIVED_DIR/XPathGrammar.cpp', '$DERIVED_DIR/CSSGrammar.cpp', '$DERIVED_DIR/XMLNames.cpp', @@ -50,12 +51,14 @@ inputs = [ '$DERIVED_DIR/V8XPathException.cpp', '$DERIVED_DIR/V8XPathEvaluator.cpp', '$DERIVED_DIR/V8XMLSerializer.cpp', + '$DERIVED_DIR/V8XMLHttpRequestUpload.cpp', '$DERIVED_DIR/V8XMLHttpRequestException.cpp', '$DERIVED_DIR/V8XMLHttpRequest.cpp', '$DERIVED_DIR/V8WheelEvent.cpp', '$DERIVED_DIR/V8UndetectableHTMLCollection.cpp', '$DERIVED_DIR/V8UIEvent.cpp', '$DERIVED_DIR/V8TreeWalker.cpp', + '$DERIVED_DIR/V8TextMetrics.cpp', '$DERIVED_DIR/V8TextEvent.cpp', '$DERIVED_DIR/V8Text.cpp', '$DERIVED_DIR/V8SVGZoomEvent.cpp', @@ -78,6 +81,7 @@ inputs = [ '$DERIVED_DIR/V8SVGStyleElement.cpp', '$DERIVED_DIR/V8SVGStringList.cpp', '$DERIVED_DIR/V8SVGStopElement.cpp', + '$DERIVED_DIR/V8SVGSetElement.cpp', '$DERIVED_DIR/V8SVGScriptElement.cpp', '$DERIVED_DIR/V8SVGRenderingIntent.cpp', '$DERIVED_DIR/V8SVGRectElement.cpp', @@ -116,6 +120,7 @@ inputs = [ '$DERIVED_DIR/V8SVGNumber.cpp', '$DERIVED_DIR/V8SVGMetadataElement.cpp', '$DERIVED_DIR/V8SVGMatrix.cpp', + '$DERIVED_DIR/V8SVGMaskElement.cpp', '$DERIVED_DIR/V8SVGMarkerElement.cpp', '$DERIVED_DIR/V8SVGLineElement.cpp', '$DERIVED_DIR/V8SVGLinearGradientElement.cpp', @@ -139,9 +144,13 @@ inputs = [ '$DERIVED_DIR/V8SVGDescElement.cpp', '$DERIVED_DIR/V8SVGDefsElement.cpp', '$DERIVED_DIR/V8SVGDefinitionSrcElement.cpp', + '$DERIVED_DIR/V8SVGCursorElement.cpp', '$DERIVED_DIR/V8SVGColor.cpp', '$DERIVED_DIR/V8SVGClipPathElement.cpp', '$DERIVED_DIR/V8SVGCircleElement.cpp', + '$DERIVED_DIR/V8SVGAnimationElement.cpp', + '$DERIVED_DIR/V8SVGAnimateTransformElement.cpp', + '$DERIVED_DIR/V8SVGAnimateElement.cpp', '$DERIVED_DIR/V8SVGAnimatedTransformList.cpp', '$DERIVED_DIR/V8SVGAnimatedString.cpp', '$DERIVED_DIR/V8SVGAnimatedRect.cpp', @@ -155,6 +164,7 @@ inputs = [ '$DERIVED_DIR/V8SVGAnimatedEnumeration.cpp', '$DERIVED_DIR/V8SVGAnimatedBoolean.cpp', '$DERIVED_DIR/V8SVGAnimatedAngle.cpp', + '$DERIVED_DIR/V8SVGAnimateColorElement.cpp', '$DERIVED_DIR/V8SVGAngle.cpp', '$DERIVED_DIR/V8SVGAElement.cpp', '$DERIVED_DIR/V8StyleSheetList.cpp', @@ -166,17 +176,27 @@ inputs = [ '$DERIVED_DIR/V8Range.cpp', '$DERIVED_DIR/V8ProgressEvent.cpp', '$DERIVED_DIR/V8ProcessingInstruction.cpp', + '$DERIVED_DIR/V8PluginArray.cpp', + '$DERIVED_DIR/V8Plugin.cpp', '$DERIVED_DIR/V8OverflowEvent.cpp', + '$DERIVED_DIR/V8NSResolver.cpp', '$DERIVED_DIR/V8Notation.cpp', '$DERIVED_DIR/V8NodeList.cpp', '$DERIVED_DIR/V8NodeIterator.cpp', '$DERIVED_DIR/V8NodeFilter.cpp', '$DERIVED_DIR/V8Node.cpp', + '$DERIVED_DIR/V8Navigator.cpp', '$DERIVED_DIR/V8NamedNodeMap.cpp', '$DERIVED_DIR/V8MutationEvent.cpp', + '$DERIVED_DIR/V8MouseEvent.cpp', + '$DERIVED_DIR/V8MimeTypeArray.cpp', + '$DERIVED_DIR/V8MimeType.cpp', '$DERIVED_DIR/V8MessageEvent.cpp', '$DERIVED_DIR/V8MediaList.cpp', + '$DERIVED_DIR/V8Location.cpp', '$DERIVED_DIR/V8KeyboardEvent.cpp', + '$DERIVED_DIR/V8InspectorController.cpp', + '$DERIVED_DIR/V8ImageData.cpp', '$DERIVED_DIR/V8HTMLUListElement.cpp', '$DERIVED_DIR/V8HTMLTitleElement.cpp', '$DERIVED_DIR/V8HTMLTextAreaElement.cpp', @@ -187,6 +207,7 @@ inputs = [ '$DERIVED_DIR/V8HTMLTableCellElement.cpp', '$DERIVED_DIR/V8HTMLTableCaptionElement.cpp', '$DERIVED_DIR/V8HTMLStyleElement.cpp', + '$DERIVED_DIR/V8HTMLSelectionInputElement.cpp', '$DERIVED_DIR/V8HTMLSelectElement.cpp', '$DERIVED_DIR/V8HTMLScriptElement.cpp', '$DERIVED_DIR/V8HTMLQuoteElement.cpp', @@ -207,6 +228,8 @@ inputs = [ '$DERIVED_DIR/V8HTMLLIElement.cpp', '$DERIVED_DIR/V8HTMLLegendElement.cpp', '$DERIVED_DIR/V8HTMLLabelElement.cpp', + '$DERIVED_DIR/V8HTMLIsIndexElement.cpp', + '$DERIVED_DIR/V8HTMLInputElement.cpp', '$DERIVED_DIR/V8HTMLImageElement.cpp', '$DERIVED_DIR/V8HTMLIFrameElement.cpp', '$DERIVED_DIR/V8HTMLHtmlElement.cpp', @@ -236,12 +259,15 @@ inputs = [ '$DERIVED_DIR/V8HTMLAppletElement.cpp', '$DERIVED_DIR/V8HTMLAnchorElement.cpp', '$DERIVED_DIR/V8History.cpp', + '$DERIVED_DIR/V8FileList.cpp', + '$DERIVED_DIR/V8File.cpp', '$DERIVED_DIR/V8EventTargetNode.cpp', '$DERIVED_DIR/V8EventException.cpp', '$DERIVED_DIR/V8Event.cpp', '$DERIVED_DIR/V8EntityReference.cpp', '$DERIVED_DIR/V8Entity.cpp', '$DERIVED_DIR/V8Element.cpp', + '$DERIVED_DIR/V8DOMWindow.cpp', '$DERIVED_DIR/V8DOMSelection.cpp', '$DERIVED_DIR/V8DOMParser.cpp', '$DERIVED_DIR/V8DOMImplementation.cpp', @@ -249,6 +275,8 @@ inputs = [ '$DERIVED_DIR/V8DocumentType.cpp', '$DERIVED_DIR/V8DocumentFragment.cpp', '$DERIVED_DIR/V8Document.cpp', + '$DERIVED_DIR/V8CSSVariablesRule.cpp', + '$DERIVED_DIR/V8CSSVariablesDeclaration.cpp', '$DERIVED_DIR/V8CSSValueList.cpp', '$DERIVED_DIR/V8CSSValue.cpp', '$DERIVED_DIR/V8CSSStyleSheet.cpp', @@ -265,32 +293,55 @@ inputs = [ '$DERIVED_DIR/V8Counter.cpp', '$DERIVED_DIR/V8Console.cpp', '$DERIVED_DIR/V8Comment.cpp', + '$DERIVED_DIR/V8Clipboard.cpp', '$DERIVED_DIR/V8CharacterData.cpp', '$DERIVED_DIR/V8CDATASection.cpp', '$DERIVED_DIR/V8CanvasRenderingContext2D.cpp', + '$DERIVED_DIR/V8CanvasPixelArray.cpp', '$DERIVED_DIR/V8CanvasPattern.cpp', '$DERIVED_DIR/V8CanvasGradient.cpp', '$DERIVED_DIR/V8BarInfo.cpp', '$DERIVED_DIR/V8Attr.cpp', '$DERIVED_DIR/UserAgentStyleSheetsData.cpp', '$DERIVED_DIR/SVGNames.cpp', + '$DERIVED_DIR/SVGElementFactory.cpp', '$DERIVED_DIR/HTMLNames.cpp', - ] + + '$PORT_DIR/bindings/v8/JSNSResolver.cpp', + '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp', + '$PORT_DIR/bindings/v8/np_v8object.cpp', + '$PORT_DIR/bindings/v8/npruntime.cpp', + '$PORT_DIR/bindings/v8/v8_custom.cpp', + '$PORT_DIR/bindings/v8/v8_events.cpp', + '$PORT_DIR/bindings/v8/v8_helpers.cpp', + '$PORT_DIR/bindings/v8/v8_index.cpp', + '$PORT_DIR/bindings/v8/v8_nodefilter.cpp', + '$PORT_DIR/bindings/v8/v8_np_utils.cpp', + '$PORT_DIR/bindings/v8/v8_npobject.cpp', + '$PORT_DIR/bindings/v8/v8_proxy.cpp', + '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp', + '$PORT_DIR/bindings/v8/V8XMLHttpRequestCustom.cpp', + '$PORT_DIR/page/inspector/InspectorController.cpp', + + 'precompiled_v8bindings.cpp', +] # TODO(erg): These are temporarily disabled during the merge of code back to # WebKit. As soon as we're back on TOT, these go back into the working files # section. -if env['PLATFORM'] == 'win32': - inputs += [ +if env['PLATFORM'] in ('darwin', 'posix'): + remove_files = [ '$DERIVED_DIR/SVGElementFactory.cpp', '$DERIVED_DIR/V8SVGCursorElement.cpp', '$DERIVED_DIR/V8SVGMaskElement.cpp', ] + for remove in remove_files: + inputs.remove(remove) # TODO(erg): Get Frame.h ported and half of this should compile. Get whatever # String.h is referenced below and the other half should compile -if env['PLATFORM'] == 'win32': - inputs += [ +if env['PLATFORM'] in ('darwin', 'posix'): + remove_files = [ '$DERIVED_DIR/V8Clipboard.cpp', '$DERIVED_DIR/V8DOMWindow.cpp', '$DERIVED_DIR/V8HTMLInputElement.cpp', @@ -304,22 +355,8 @@ if env['PLATFORM'] == 'win32': '$DERIVED_DIR/V8Navigator.cpp', '$DERIVED_DIR/V8Plugin.cpp', '$DERIVED_DIR/V8PluginArray.cpp', - '$PORT_DIR/bindings/v8/JSXPathNSResolver.cpp', - '$PORT_DIR/bindings/v8/np_v8object.cpp', - '$PORT_DIR/bindings/v8/npruntime.cpp', - '$PORT_DIR/bindings/v8/v8_custom.cpp', - '$PORT_DIR/bindings/v8/v8_events.cpp', - '$PORT_DIR/bindings/v8/v8_helpers.cpp', - '$PORT_DIR/bindings/v8/v8_index.cpp', - '$PORT_DIR/bindings/v8/v8_nodefilter.cpp', - '$PORT_DIR/bindings/v8/v8_np_utils.cpp', - '$PORT_DIR/bindings/v8/v8_npobject.cpp', - '$PORT_DIR/bindings/v8/v8_proxy.cpp', - '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp', - '$PORT_DIR/bridge/V8Bridge.cpp', - '$PORT_DIR/page/Location.cpp', - '$PORT_DIR/page/Navigator.cpp', - '$PORT_DIR/page/inspector/InspectorController.cpp', - ] + ] + for remove in remove_files: + inputs.remove(remove) env.ChromeStaticLibrary('V8Bindings', inputs) diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 0813005..76ceb8c 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -19,6 +19,9 @@ if env['PLATFORM'] == 'win32': '/wd4099', '/wd4800', ], + CPPDEFINES = [ + '__STD_C', + ], ) if env['PLATFORM'] in ('darwin', 'posix'): @@ -34,17 +37,20 @@ if env['PLATFORM'] in ('darwin', 'posix'): env['CCFLAGS'].remove('-Werror') input_files = [ - '$PENDING_DIR/JSSVGLazyEventListener.cpp', - '$WEBCORE_DIR/css/CSSBorderImageValue.cpp', + '$WEBCORE_DIR/css/CSSCanvasValue.cpp', '$WEBCORE_DIR/css/CSSCharsetRule.cpp', '$WEBCORE_DIR/css/CSSComputedStyleDeclaration.cpp', '$WEBCORE_DIR/css/CSSCursorImageValue.cpp', '$WEBCORE_DIR/css/CSSFontFace.cpp', '$WEBCORE_DIR/css/CSSFontFaceRule.cpp', + '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', '$WEBCORE_DIR/css/CSSFontFaceSrcValue.cpp', - '$PENDING_DIR/CSSFontSelector.cpp', + '$WEBCORE_DIR/css/CSSFontSelector.cpp', + '$WEBCORE_DIR/css/CSSFunctionValue.cpp', + '$WEBCORE_DIR/css/CSSGradientValue.cpp', '$WEBCORE_DIR/css/CSSHelper.cpp', + '$WEBCORE_DIR/css/CSSImageGeneratorValue.cpp', '$WEBCORE_DIR/css/CSSImageValue.cpp', '$WEBCORE_DIR/css/CSSImportRule.cpp', '$WEBCORE_DIR/css/CSSInheritedValue.cpp', @@ -52,21 +58,25 @@ input_files = [ '$WEBCORE_DIR/css/CSSMediaRule.cpp', '$WEBCORE_DIR/css/CSSMutableStyleDeclaration.cpp', '$WEBCORE_DIR/css/CSSPageRule.cpp', - '$PENDING_DIR/CSSParser.cpp', + '$WEBCORE_DIR/css/CSSParser.cpp', + '$WEBCORE_DIR/css/CSSParserValues.cpp', '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp', '$WEBCORE_DIR/css/CSSProperty.cpp', + '$WEBCORE_DIR/css/CSSReflectValue.cpp', '$WEBCORE_DIR/css/CSSRule.cpp', '$WEBCORE_DIR/css/CSSRuleList.cpp', '$WEBCORE_DIR/css/CSSSegmentedFontFace.cpp', '$WEBCORE_DIR/css/CSSSelector.cpp', '$WEBCORE_DIR/css/CSSStyleDeclaration.cpp', '$WEBCORE_DIR/css/CSSStyleRule.cpp', - '$PENDING_DIR/CSSStyleSelector.cpp', + '$WEBCORE_DIR/css/CSSStyleSelector.cpp', '$WEBCORE_DIR/css/CSSStyleSheet.cpp', '$WEBCORE_DIR/css/CSSTimingFunctionValue.cpp', - '$WEBCORE_DIR/css/CSSTransformValue.cpp', '$WEBCORE_DIR/css/CSSUnicodeRangeValue.cpp', '$WEBCORE_DIR/css/CSSValueList.cpp', + '$WEBCORE_DIR/css/CSSVariableDependentValue.cpp', + '$WEBCORE_DIR/css/CSSVariablesDeclaration.cpp', + '$WEBCORE_DIR/css/CSSVariablesRule.cpp', '$WEBCORE_DIR/css/FontFamilyValue.cpp', '$WEBCORE_DIR/css/FontValue.cpp', '$WEBCORE_DIR/css/MediaFeatureNames.cpp', @@ -82,22 +92,25 @@ input_files = [ '$WEBCORE_DIR/css/SVGCSSComputedStyleDeclaration.cpp', '$WEBCORE_DIR/css/SVGCSSParser.cpp', '$WEBCORE_DIR/css/SVGCSSStyleSelector.cpp', + '$WEBCORE_DIR/css/WebKitCSSKeyframeRule.cpp', + '$WEBCORE_DIR/css/WebKitCSSKeyframesRule.cpp', + '$WEBCORE_DIR/css/WebKitCSSTransformValue.cpp', '$WEBCORE_DIR/dom/Attr.cpp', '$WEBCORE_DIR/dom/Attribute.cpp', '$WEBCORE_DIR/dom/BeforeTextInsertedEvent.cpp', '$WEBCORE_DIR/dom/BeforeUnloadEvent.cpp', '$WEBCORE_DIR/dom/CDATASection.cpp', - '$PENDING_DIR/CharacterData.cpp', + '$WEBCORE_DIR/dom/CharacterData.cpp', '$WEBCORE_DIR/dom/ChildNodeList.cpp', '$WEBCORE_DIR/dom/ClassNames.cpp', '$WEBCORE_DIR/dom/ClassNodeList.cpp', '$WEBCORE_DIR/dom/Clipboard.cpp', '$WEBCORE_DIR/dom/ClipboardEvent.cpp', '$WEBCORE_DIR/dom/Comment.cpp', - '$PENDING_DIR/ContainerNode.cpp', + '$WEBCORE_DIR/dom/ContainerNode.cpp', '$WEBCORE_DIR/dom/CSSMappedAttributeDeclaration.cpp', - '$PENDING_DIR/Document.cpp', + '$WEBCORE_DIR/dom/Document.cpp', '$WEBCORE_DIR/dom/DocumentFragment.cpp', '$WEBCORE_DIR/dom/DocumentType.cpp', '$WEBCORE_DIR/dom/DOMImplementation.cpp', @@ -108,8 +121,8 @@ input_files = [ '$WEBCORE_DIR/dom/EntityReference.cpp', '$WEBCORE_DIR/dom/Event.cpp', '$WEBCORE_DIR/dom/EventNames.cpp', - '$PENDING_DIR/EventTarget.cpp', - '$PENDING_DIR/EventTargetNode.cpp', + '$WEBCORE_DIR/dom/EventTarget.cpp', + '$WEBCORE_DIR/dom/EventTargetNode.cpp', '$WEBCORE_DIR/dom/ExceptionBase.cpp', '$WEBCORE_DIR/dom/ExceptionCode.cpp', '$WEBCORE_DIR/dom/KeyboardEvent.cpp', @@ -118,13 +131,19 @@ input_files = [ '$WEBCORE_DIR/dom/MouseEvent.cpp', '$WEBCORE_DIR/dom/MouseRelatedEvent.cpp', '$WEBCORE_DIR/dom/MutationEvent.cpp', - '$PENDING_DIR/NamedAttrMap.cpp', + '$WEBCORE_DIR/dom/NamedAttrMap.cpp', '$WEBCORE_DIR/dom/NamedMappedAttrMap.cpp', '$WEBCORE_DIR/dom/NameNodeList.cpp', - '$PENDING_DIR/Node.cpp', - '$WEBCORE_DIR/dom/NodeFilter.cpp', - '$WEBCORE_DIR/dom/NodeFilterCondition.cpp', - '$WEBCORE_DIR/dom/NodeIterator.cpp', + '$WEBCORE_DIR/dom/Node.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/dom/NodeFilter.cpp', + '$PENDING_DIR/NodeFilter.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/dom/NodeFilterCondition.cpp', + '$PENDING_DIR/NodeFilterCondition.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/dom/NodeIterator.cpp', + '$PENDING_DIR/NodeIterator.cpp', '$WEBCORE_DIR/dom/Notation.cpp', '$WEBCORE_DIR/dom/OverflowEvent.cpp', '$WEBCORE_DIR/dom/Position.cpp', @@ -134,6 +153,7 @@ input_files = [ '$WEBCORE_DIR/dom/QualifiedName.cpp', '$WEBCORE_DIR/dom/Range.cpp', '$WEBCORE_DIR/dom/RegisteredEventListener.cpp', + '$WEBCORE_DIR/dom/ScriptElement.cpp', '$WEBCORE_DIR/dom/SelectorNodeList.cpp', '$WEBCORE_DIR/dom/StaticNodeList.cpp', '$WEBCORE_DIR/dom/StyledElement.cpp', @@ -141,12 +161,18 @@ input_files = [ '$WEBCORE_DIR/dom/TagNodeList.cpp', '$WEBCORE_DIR/dom/Text.cpp', '$WEBCORE_DIR/dom/TextEvent.cpp', - '$WEBCORE_DIR/dom/Traversal.cpp', - '$WEBCORE_DIR/dom/TreeWalker.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/dom/Traversal.cpp', + '$PENDING_DIR/Traversal.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/dom/TreeWalker.cpp', + '$PENDING_DIR/TreeWalker.cpp', '$WEBCORE_DIR/dom/UIEvent.cpp', '$WEBCORE_DIR/dom/UIEventWithKeyState.cpp', + '$WEBCORE_DIR/dom/WebKitAnimationEvent.cpp', + '$WEBCORE_DIR/dom/WebKitTransitionEvent.cpp', '$WEBCORE_DIR/dom/WheelEvent.cpp', - '$PENDING_DIR/XMLTokenizer.cpp', + '$WEBCORE_DIR/dom/XMLTokenizer.cpp', '$WEBCORE_DIR/editing/AppendNodeCommand.cpp', '$WEBCORE_DIR/editing/ApplyStyleCommand.cpp', @@ -154,15 +180,18 @@ input_files = [ '$WEBCORE_DIR/editing/CompositeEditCommand.cpp', '$WEBCORE_DIR/editing/CreateLinkCommand.cpp', '$WEBCORE_DIR/editing/DeleteButton.cpp', - '$WEBCORE_DIR/editing/DeleteButtonController.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/editing/DeleteButtonController.cpp', + '$PENDING_DIR/DeleteButtonController.cpp', '$WEBCORE_DIR/editing/DeleteFromTextNodeCommand.cpp', - '$PENDING_DIR/DeleteSelectionCommand.cpp', + '$WEBCORE_DIR/editing/DeleteSelectionCommand.cpp', '$WEBCORE_DIR/editing/EditCommand.cpp', + '$WEBCORE_DIR/editing/Editor.cpp', '$WEBCORE_DIR/editing/EditorCommand.cpp', '$WEBCORE_DIR/editing/FormatBlockCommand.cpp', '$WEBCORE_DIR/editing/htmlediting.cpp', '$WEBCORE_DIR/editing/HTMLInterchange.cpp', - '$PENDING_DIR/IndentOutdentCommand.cpp', + '$WEBCORE_DIR/editing/IndentOutdentCommand.cpp', '$WEBCORE_DIR/editing/InsertIntoTextNodeCommand.cpp', '$WEBCORE_DIR/editing/InsertLineBreakCommand.cpp', '$WEBCORE_DIR/editing/InsertListCommand.cpp', @@ -170,21 +199,23 @@ input_files = [ '$WEBCORE_DIR/editing/InsertParagraphSeparatorCommand.cpp', '$WEBCORE_DIR/editing/InsertTextCommand.cpp', '$WEBCORE_DIR/editing/JoinTextNodesCommand.cpp', - '$PENDING_DIR/markup.cpp', + '$WEBCORE_DIR/editing/markup.cpp', '$WEBCORE_DIR/editing/MergeIdenticalElementsCommand.cpp', '$WEBCORE_DIR/editing/ModifySelectionListLevel.cpp', '$WEBCORE_DIR/editing/MoveSelectionCommand.cpp', '$WEBCORE_DIR/editing/RemoveCSSPropertyCommand.cpp', - '$PENDING_DIR/RemoveFormatCommand.cpp', + '$WEBCORE_DIR/editing/RemoveFormatCommand.cpp', '$WEBCORE_DIR/editing/RemoveNodeAttributeCommand.cpp', '$WEBCORE_DIR/editing/RemoveNodeCommand.cpp', '$WEBCORE_DIR/editing/RemoveNodePreservingChildrenCommand.cpp', - '$PENDING_DIR/ReplaceSelectionCommand.cpp', + '$WEBCORE_DIR/editing/ReplaceSelectionCommand.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/editing/Selection.cpp', '$PENDING_DIR/Selection.cpp', '$WEBCORE_DIR/editing/SelectionController.cpp', '$WEBCORE_DIR/editing/SetNodeAttributeCommand.cpp', + #'$WEBCORE_DIR/editing/SmartReplace.cpp', '$WEBCORE_DIR/editing/SmartReplaceICU.cpp', - '$WEBCORE_DIR/editing/SmartReplace.cpp', '$WEBCORE_DIR/editing/SplitElementCommand.cpp', '$WEBCORE_DIR/editing/SplitTextNodeCommand.cpp', '$WEBCORE_DIR/editing/SplitTextNodeContainingElementCommand.cpp', @@ -198,13 +229,19 @@ input_files = [ '$WEBCORE_DIR/history/PageCache.cpp', '$WEBCORE_DIR/history/HistoryItem.cpp', - '$PENDING_DIR/CanvasGradient.cpp', - '$PENDING_DIR/CanvasPattern.cpp', - '$PENDING_DIR/CanvasStyle.cpp', + '$WEBCORE_DIR/html/CanvasGradient.cpp', + '$WEBCORE_DIR/html/CanvasPattern.cpp', + '$WEBCORE_DIR/html/CanvasPixelArray.cpp', + '$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp', + '$WEBCORE_DIR/html/CanvasStyle.cpp', + '$WEBCORE_DIR/html/File.cpp', + '$WEBCORE_DIR/html/FileList.cpp', '$WEBCORE_DIR/html/FormDataList.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/html/HTMLAnchorElement.cpp', '$PENDING_DIR/HTMLAnchorElement.cpp', - '$PENDING_DIR/HTMLAppletElement.cpp', - '$PENDING_DIR/HTMLAreaElement.cpp', + '$WEBCORE_DIR/html/HTMLAppletElement.cpp', + '$WEBCORE_DIR/html/HTMLAreaElement.cpp', '$WEBCORE_DIR/html/HTMLAudioElement.cpp', '$WEBCORE_DIR/html/HTMLBaseElement.cpp', '$WEBCORE_DIR/html/HTMLBaseFontElement.cpp', @@ -212,24 +249,24 @@ input_files = [ '$WEBCORE_DIR/html/HTMLBodyElement.cpp', '$WEBCORE_DIR/html/HTMLBRElement.cpp', '$WEBCORE_DIR/html/HTMLButtonElement.cpp', - '$PENDING_DIR/HTMLCanvasElement.cpp', + '$WEBCORE_DIR/html/HTMLCanvasElement.cpp', '$WEBCORE_DIR/html/HTMLCollection.cpp', '$WEBCORE_DIR/html/HTMLDirectoryElement.cpp', '$WEBCORE_DIR/html/HTMLDivElement.cpp', '$WEBCORE_DIR/html/HTMLDListElement.cpp', '$WEBCORE_DIR/html/HTMLDocument.cpp', - '$PENDING_DIR/HTMLElement.cpp', + '$WEBCORE_DIR/html/HTMLElement.cpp', '$WEBCORE_DIR/html/HTMLElementFactory.cpp', - '$PENDING_DIR/HTMLEmbedElement.cpp', - '$PENDING_DIR/HTMLFieldSetElement.cpp', + '$WEBCORE_DIR/html/HTMLEmbedElement.cpp', + '$WEBCORE_DIR/html/HTMLFieldSetElement.cpp', '$WEBCORE_DIR/html/HTMLFontElement.cpp', '$WEBCORE_DIR/html/HTMLFormCollection.cpp', + '$WEBCORE_DIR/html/HTMLFormControlElement.cpp', '$WEBCORE_DIR/html/HTMLFormElement.cpp', '$WEBCORE_DIR/html/HTMLFrameElement.cpp', '$WEBCORE_DIR/html/HTMLFrameElementBase.cpp', '$WEBCORE_DIR/html/HTMLFrameOwnerElement.cpp', '$WEBCORE_DIR/html/HTMLFrameSetElement.cpp', - '$PENDING_DIR/HTMLGenericFormElement.cpp', '$WEBCORE_DIR/html/HTMLHeadElement.cpp', '$WEBCORE_DIR/html/HTMLHeadingElement.cpp', '$WEBCORE_DIR/html/HTMLHRElement.cpp', @@ -237,12 +274,14 @@ input_files = [ '$WEBCORE_DIR/html/HTMLIFrameElement.cpp', '$WEBCORE_DIR/html/HTMLImageElement.cpp', '$WEBCORE_DIR/html/HTMLImageLoader.cpp', - '$PENDING_DIR/HTMLInputElement.cpp', + '$WEBCORE_DIR/html/HTMLInputElement.cpp', '$WEBCORE_DIR/html/HTMLIsIndexElement.cpp', '$WEBCORE_DIR/html/HTMLKeygenElement.cpp', '$WEBCORE_DIR/html/HTMLLabelElement.cpp', - '$PENDING_DIR/HTMLLegendElement.cpp', + '$WEBCORE_DIR/html/HTMLLegendElement.cpp', '$WEBCORE_DIR/html/HTMLLIElement.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/html/HTMLLinkElement.cpp', '$PENDING_DIR/HTMLLinkElement.cpp', '$WEBCORE_DIR/html/HTMLMapElement.cpp', '$WEBCORE_DIR/html/HTMLMarqueeElement.cpp', @@ -251,19 +290,20 @@ input_files = [ '$WEBCORE_DIR/html/HTMLMetaElement.cpp', '$WEBCORE_DIR/html/HTMLModElement.cpp', '$WEBCORE_DIR/html/HTMLNameCollection.cpp', - '$PENDING_DIR/HTMLObjectElement.cpp', + '$WEBCORE_DIR/html/HTMLObjectElement.cpp', '$WEBCORE_DIR/html/HTMLOListElement.cpp', - '$PENDING_DIR/HTMLOptGroupElement.cpp', - '$PENDING_DIR/HTMLOptionElement.cpp', + '$WEBCORE_DIR/html/HTMLOptGroupElement.cpp', + '$WEBCORE_DIR/html/HTMLOptionElement.cpp', '$WEBCORE_DIR/html/HTMLOptionsCollection.cpp', '$WEBCORE_DIR/html/HTMLParagraphElement.cpp', '$WEBCORE_DIR/html/HTMLParamElement.cpp', - '$PENDING_DIR/HTMLParser.cpp', + '$WEBCORE_DIR/html/HTMLParser.cpp', '$WEBCORE_DIR/html/HTMLParserErrorCodes.cpp', - '$PENDING_DIR/HTMLPlugInElement.cpp', + '$WEBCORE_DIR/html/HTMLPlugInElement.cpp', + '$WEBCORE_DIR/html/HTMLPlugInImageElement.cpp', '$WEBCORE_DIR/html/HTMLPreElement.cpp', '$WEBCORE_DIR/html/HTMLQuoteElement.cpp', - '$PENDING_DIR/HTMLScriptElement.cpp', + '$WEBCORE_DIR/html/HTMLScriptElement.cpp', '$WEBCORE_DIR/html/HTMLSelectElement.cpp', '$WEBCORE_DIR/html/HTMLStyleElement.cpp', '$WEBCORE_DIR/html/HTMLTableCaptionElement.cpp', @@ -275,26 +315,30 @@ input_files = [ '$WEBCORE_DIR/html/HTMLTableRowsCollection.cpp', '$WEBCORE_DIR/html/HTMLTableSectionElement.cpp', '$WEBCORE_DIR/html/HTMLTextAreaElement.cpp', - '$WEBCORE_DIR/html/HTMLTextFieldInnerElement.cpp', '$WEBCORE_DIR/html/HTMLTitleElement.cpp', - '$PENDING_DIR/HTMLTokenizer.cpp', + '$WEBCORE_DIR/html/HTMLTokenizer.cpp', '$WEBCORE_DIR/html/HTMLUListElement.cpp', '$WEBCORE_DIR/html/HTMLVideoElement.cpp', '$WEBCORE_DIR/html/HTMLViewSourceDocument.cpp', + '$WEBCORE_DIR/html/ImageData.cpp', + '$WEBCORE_DIR/html/PreloadScanner.cpp', + '$WEBCORE_DIR/html/TimeRanges.cpp', '$WEBCORE_DIR/loader/Cache.cpp', '$WEBCORE_DIR/loader/CachedCSSStyleSheet.cpp', + '$WEBCORE_DIR/loader/CachedFont.cpp', '$WEBCORE_DIR/loader/CachedImage.cpp', '$WEBCORE_DIR/loader/CachedResource.cpp', '$WEBCORE_DIR/loader/CachedResourceClientWalker.cpp', '$WEBCORE_DIR/loader/CachedScript.cpp', '$WEBCORE_DIR/loader/CachedXBLDocument.cpp', '$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp', - '$PENDING_DIR/DocLoader.cpp', + '$WEBCORE_DIR/loader/DocLoader.cpp', '$WEBCORE_DIR/loader/DocumentLoader.cpp', '$WEBCORE_DIR/loader/FormState.cpp', - '$PENDING_DIR/FrameLoader.cpp', + '$WEBCORE_DIR/loader/FrameLoader.cpp', '$WEBCORE_DIR/loader/FTPDirectoryDocument.cpp', + '$WEBCORE_DIR/loader/FTPDirectoryParser.cpp', '$WEBCORE_DIR/loader/ImageDocument.cpp', '$WEBCORE_DIR/loader/loader.cpp', '$WEBCORE_DIR/loader/MainResourceLoader.cpp', @@ -306,45 +350,61 @@ input_files = [ '$WEBCORE_DIR/loader/ResourceLoader.cpp', '$WEBCORE_DIR/loader/SubresourceLoader.cpp', '$WEBCORE_DIR/loader/TextDocument.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/loader/TextResourceDecoder.cpp', '$PENDING_DIR/TextResourceDecoder.cpp', - '$WEBCORE_DIR/page/AnimationController.cpp', - '$WEBCORE_DIR/page/BarInfo.cpp', - '$PENDING_DIR/AXObjectCache.cpp', - '$WEBCORE_DIR/page/AnimationController.cpp', - '$PENDING_DIR/AccessibilityObject.cpp', + '$WEBCORE_DIR/loader/archive/ArchiveFactory.cpp', + '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp', + '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp', + + '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp', + '$WEBCORE_DIR/page/AccessibilityListBox.cpp', + '$WEBCORE_DIR/page/AccessibilityListBoxOption.cpp', + '$WEBCORE_DIR/page/AccessibilityObject.cpp', + '$WEBCORE_DIR/page/AccessibilityRenderObject.cpp', + '$WEBCORE_DIR/page/AccessibilityTable.cpp', + '$WEBCORE_DIR/page/AccessibilityTableCell.cpp', + '$WEBCORE_DIR/page/AccessibilityTableColumn.cpp', + '$WEBCORE_DIR/page/AccessibilityTableHeaderContainer.cpp', + '$WEBCORE_DIR/page/AccessibilityTableRow.cpp', + '$WEBCORE_DIR/page/AXObjectCache.cpp', '$WEBCORE_DIR/page/BarInfo.cpp', - '$PENDING_DIR/Chrome.cpp', - '$WEBCORE_DIR/page/Console.cpp', + '$WEBCORE_DIR/page/Chrome.cpp', '$WEBCORE_DIR/page/ContextMenuController.cpp', '$WEBCORE_DIR/page/DOMSelection.cpp', - '$PENDING_DIR/DOMWindow.cpp', - '$PENDING_DIR/DragController.cpp', + '$WEBCORE_DIR/page/DOMWindow.cpp', + '$WEBCORE_DIR/page/DragController.cpp', + '$WEBCORE_DIR/page/EventHandler.cpp', '$WEBCORE_DIR/page/FocusController.cpp', - '$PENDING_DIR/Frame.cpp', + '$WEBCORE_DIR/page/Frame.cpp', '$WEBCORE_DIR/page/FrameTree.cpp', - '$PENDING_DIR/FrameView.cpp', + '$WEBCORE_DIR/page/FrameView.cpp', '$WEBCORE_DIR/page/History.cpp', '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/page/Page.cpp', '$PENDING_DIR/Page.cpp', + '$WEBCORE_DIR/page/PageGroup.cpp', '$WEBCORE_DIR/page/Screen.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/page/Settings.cpp', '$PENDING_DIR/Settings.cpp', '$WEBCORE_DIR/page/WindowFeatures.cpp', + '$WEBCORE_DIR/page/animation/AnimationBase.cpp', + '$WEBCORE_DIR/page/animation/AnimationController.cpp', + '$WEBCORE_DIR/page/animation/CompositeAnimation.cpp', + '$WEBCORE_DIR/page/animation/ImplicitAnimation.cpp', + '$WEBCORE_DIR/page/animation/KeyframeAnimation.cpp', + '$WEBCORE_DIR/platform/Arena.cpp', - '$WEBCORE_DIR/platform/ArrayImpl.cpp', - '$WEBCORE_DIR/platform/DeprecatedCString.cpp', + '$WEBCORE_DIR/platform/ContextMenu.cpp', '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp', - '$PENDING_DIR/DeprecatedString.cpp', - '$WEBCORE_DIR/platform/DeprecatedStringList.cpp', '$WEBCORE_DIR/platform/DeprecatedValueListImpl.cpp', '$WEBCORE_DIR/platform/DragData.cpp', '$WEBCORE_DIR/platform/DragImage.cpp', - '$PENDING_DIR/FontCache.cpp', - '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp', - '$WEBCORE_DIR/platform/graphics/FontFamily.cpp', - '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp', - '$PENDING_DIR/GlyphWidthMap.cpp', + '$WEBCORE_DIR/platform/FileChooser.cpp', '$PENDING_DIR/KURL.cpp', '$WEBCORE_DIR/platform/Logging.cpp', '$PORT_DIR/platform/MIMETypeRegistry.cpp', @@ -353,59 +413,87 @@ input_files = [ '$WEBCORE_DIR/platform/SharedBuffer.cpp', '$WEBCORE_DIR/platform/Timer.cpp', '$WEBCORE_DIR/platform/Widget.cpp', + + '$WEBCORE_DIR/platform/graphics/AffineTransform.cpp', - '$PENDING_DIR/BitmapImage.cpp', + '$WEBCORE_DIR/platform/graphics/BitmapImage.cpp', '$WEBCORE_DIR/platform/graphics/Color.cpp', '$WEBCORE_DIR/platform/graphics/FloatPoint.cpp', '$WEBCORE_DIR/platform/graphics/FloatPoint3D.cpp', '$WEBCORE_DIR/platform/graphics/FloatRect.cpp', '$WEBCORE_DIR/platform/graphics/FloatSize.cpp', + '$WEBCORE_DIR/platform/graphics/Font.cpp', '$WEBCORE_DIR/platform/graphics/FontData.cpp', + '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp', + '$WEBCORE_DIR/platform/graphics/FontDescription.cpp', + '$WEBCORE_DIR/platform/graphics/FontFamily.cpp', + '$WEBCORE_DIR/platform/graphics/FontCache.cpp', + '$WEBCORE_DIR/platform/graphics/GeneratedImage.cpp', + '$WEBCORE_DIR/platform/graphics/GlyphPageTreeNode.cpp', + '$WEBCORE_DIR/platform/graphics/GlyphWidthMap.cpp', + '$WEBCORE_DIR/platform/graphics/Gradient.cpp', '$WEBCORE_DIR/platform/graphics/GraphicsContext.cpp', '$WEBCORE_DIR/platform/graphics/GraphicsTypes.cpp', '$WEBCORE_DIR/platform/graphics/Image.cpp', '$WEBCORE_DIR/platform/graphics/IntRect.cpp', '$WEBCORE_DIR/platform/graphics/Path.cpp', '$WEBCORE_DIR/platform/graphics/PathTraversalState.cpp', + '$WEBCORE_DIR/platform/graphics/Pattern.cpp', '$WEBCORE_DIR/platform/graphics/Pen.cpp', '$WEBCORE_DIR/platform/graphics/SegmentedFontData.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/platform/graphics/SimpleFontData.cpp', '$PENDING_DIR/SimpleFontData.cpp', - '$WEBCORE_DIR/platform/network/AuthenticationChallenge.cpp', + '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp', + + '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', '$WEBCORE_DIR/platform/network/Credential.cpp', '$WEBCORE_DIR/platform/network/FormData.cpp', '$WEBCORE_DIR/platform/network/HTTPParsers.cpp', + '$WEBCORE_DIR/platform/network/NetworkStateNotifier.cpp', '$WEBCORE_DIR/platform/network/ProtectionSpace.cpp', - '$WEBCORE_DIR/platform/network/ResourceError.cpp', + '$WEBCORE_DIR/platform/network/ResourceErrorBase.cpp', + #'$WEBCORE_DIR/platform/network/ResourceHandle.cpp', '$WEBCORE_DIR/platform/network/ResourceRequestBase.cpp', '$WEBCORE_DIR/platform/network/ResourceResponseBase.cpp', - '$PENDING_DIR/AtomicString.cpp', + + '$WEBCORE_DIR/platform/text/AtomicString.cpp', '$WEBCORE_DIR/platform/text/Base64.cpp', '$WEBCORE_DIR/platform/text/BidiContext.cpp', '$WEBCORE_DIR/platform/text/CString.cpp', '$WEBCORE_DIR/platform/text/RegularExpression.cpp', '$WEBCORE_DIR/platform/text/SegmentedString.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/platform/text/String.cpp', '$PENDING_DIR/String.cpp', + '$WEBCORE_DIR/platform/text/StringBuilder.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/platform/text/StringImpl.cpp', '$PENDING_DIR/StringImpl.cpp', - '$WEBCORE_DIR/platform/graphics/StringTruncator.cpp', '$WEBCORE_DIR/platform/text/TextBoundariesICU.cpp', '$WEBCORE_DIR/platform/text/TextBreakIteratorICU.cpp', - '$PENDING_DIR/TextCodec.cpp', + '$WEBCORE_DIR/platform/text/TextCodec.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/platform/text/TextCodecICU.cpp', '$PENDING_DIR/TextCodecICU.cpp', '$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp', '$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp', - '$PENDING_DIR/TextCodecUTF16.cpp', - '$PENDING_DIR/TextDecoder.cpp', + '$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp', + '$WEBCORE_DIR/platform/text/TextDecoder.cpp', '$WEBCORE_DIR/platform/text/TextEncoding.cpp', '$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp', '$WEBCORE_DIR/platform/text/TextStream.cpp', '$WEBCORE_DIR/platform/text/UnicodeRange.cpp', + '$WEBCORE_DIR/plugins/PluginData.cpp', + '$WEBCORE_DIR/rendering/AutoTableLayout.cpp', - '$PENDING_DIR/bidi.cpp', + '$WEBCORE_DIR/rendering/bidi.cpp', '$WEBCORE_DIR/rendering/break_lines.cpp', '$WEBCORE_DIR/rendering/CounterNode.cpp', '$WEBCORE_DIR/rendering/EllipsisBox.cpp', '$WEBCORE_DIR/rendering/FixedTableLayout.cpp', + '$WEBCORE_DIR/rendering/HitTestResult.cpp', '$WEBCORE_DIR/rendering/InlineBox.cpp', '$WEBCORE_DIR/rendering/InlineFlowBox.cpp', '$WEBCORE_DIR/rendering/InlineTextBox.cpp', @@ -415,13 +503,16 @@ input_files = [ '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp', '$WEBCORE_DIR/rendering/RenderApplet.cpp', '$WEBCORE_DIR/rendering/RenderArena.cpp', - '$PENDING_DIR/RenderBlock.cpp', + '$WEBCORE_DIR/rendering/RenderBlock.cpp', '$WEBCORE_DIR/rendering/RenderBox.cpp', '$WEBCORE_DIR/rendering/RenderBR.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderButton.cpp', '$PENDING_DIR/RenderButton.cpp', '$WEBCORE_DIR/rendering/RenderContainer.cpp', '$WEBCORE_DIR/rendering/RenderCounter.cpp', '$WEBCORE_DIR/rendering/RenderFieldset.cpp', + '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp', '$WEBCORE_DIR/rendering/RenderFlexibleBox.cpp', '$WEBCORE_DIR/rendering/RenderFlow.cpp', '$WEBCORE_DIR/rendering/RenderForeignObject.cpp', @@ -429,17 +520,26 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderFrameSet.cpp', '$WEBCORE_DIR/rendering/RenderHTMLCanvas.cpp', '$WEBCORE_DIR/rendering/RenderImage.cpp', + '$WEBCORE_DIR/rendering/RenderImageGeneratedContent.cpp', '$WEBCORE_DIR/rendering/RenderInline.cpp', + '$WEBCORE_DIR/rendering/RenderLayer.cpp', '$WEBCORE_DIR/rendering/RenderLegend.cpp', + '$WEBCORE_DIR/rendering/RenderListBox.cpp', '$WEBCORE_DIR/rendering/RenderListItem.cpp', '$WEBCORE_DIR/rendering/RenderListMarker.cpp', - '$PENDING_DIR/RenderObject.cpp', + '$WEBCORE_DIR/rendering/RenderMarquee.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderMenuList.cpp', + '$PENDING_DIR/RenderMenuList.cpp', + '$WEBCORE_DIR/rendering/RenderObject.cpp', '$WEBCORE_DIR/rendering/RenderPart.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderPartObject.cpp', '$PENDING_DIR/RenderPartObject.cpp', '$WEBCORE_DIR/rendering/RenderPath.cpp', '$WEBCORE_DIR/rendering/RenderReplaced.cpp', + '$WEBCORE_DIR/rendering/RenderReplica.cpp', '$WEBCORE_DIR/rendering/RenderSlider.cpp', - '$WEBCORE_DIR/rendering/RenderStyle.cpp', '$WEBCORE_DIR/rendering/RenderSVGBlock.cpp', '$WEBCORE_DIR/rendering/RenderSVGContainer.cpp', '$WEBCORE_DIR/rendering/RenderSVGGradientStop.cpp', @@ -453,18 +553,24 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderSVGTransformableContainer.cpp', '$WEBCORE_DIR/rendering/RenderSVGTSpan.cpp', '$WEBCORE_DIR/rendering/RenderSVGViewportContainer.cpp', - '$PENDING_DIR/RenderTable.cpp', + '$WEBCORE_DIR/rendering/RenderTable.cpp', '$WEBCORE_DIR/rendering/RenderTableCell.cpp', '$WEBCORE_DIR/rendering/RenderTableCol.cpp', '$WEBCORE_DIR/rendering/RenderTableRow.cpp', '$WEBCORE_DIR/rendering/RenderTableSection.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderText.cpp', '$PENDING_DIR/RenderText.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderTextControl.cpp', + '$PENDING_DIR/RenderTextControl.cpp', '$WEBCORE_DIR/rendering/RenderTextFragment.cpp', + '$WEBCORE_DIR/rendering/RenderTheme.cpp', '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp', '$WEBCORE_DIR/rendering/RenderVideo.cpp', '$WEBCORE_DIR/rendering/RenderView.cpp', '$WEBCORE_DIR/rendering/RenderWidget.cpp', - '$PENDING_DIR/RenderWordBreak.cpp', + '$WEBCORE_DIR/rendering/RenderWordBreak.cpp', '$WEBCORE_DIR/rendering/RootInlineBox.cpp', '$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp', '$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp', @@ -473,10 +579,19 @@ input_files = [ '$WEBCORE_DIR/rendering/SVGRenderStyleDefs.cpp', '$WEBCORE_DIR/rendering/SVGRenderSupport.cpp', '$WEBCORE_DIR/rendering/SVGRenderTreeAsText.cpp', - '$PENDING_DIR/SVGRootInlineBox.cpp', + '$WEBCORE_DIR/rendering/SVGRootInlineBox.cpp', + '$WEBCORE_DIR/rendering/TextControlInnerElements.cpp', + + '$WEBCORE_DIR/rendering/style/NinePieceImage.cpp', + '$WEBCORE_DIR/rendering/style/RenderStyle.cpp', + '$WEBCORE_DIR/rendering/style/StyleCachedImage.cpp', + '$WEBCORE_DIR/rendering/style/StyleGeneratedImage.cpp', '$WEBCORE_DIR/svg/ColorDistance.cpp', + '$WEBCORE_DIR/svg/Filter.cpp', + '$WEBCORE_DIR/svg/FilterEffect.cpp', '$WEBCORE_DIR/svg/SVGAElement.cpp', + '$WEBCORE_DIR/svg/SVGAltGlyphElement.cpp', '$WEBCORE_DIR/svg/SVGAngle.cpp', '$WEBCORE_DIR/svg/SVGAnimateColorElement.cpp', '$WEBCORE_DIR/svg/SVGAnimatedPathData.cpp', @@ -494,7 +609,7 @@ input_files = [ '$WEBCORE_DIR/svg/SVGDefsElement.cpp', '$WEBCORE_DIR/svg/SVGDescElement.cpp', '$WEBCORE_DIR/svg/SVGDocument.cpp', - '$PENDING_DIR/SVGDocumentExtensions.cpp', + '$WEBCORE_DIR/svg/SVGDocumentExtensions.cpp', '$WEBCORE_DIR/svg/SVGElement.cpp', '$WEBCORE_DIR/svg/SVGElementInstance.cpp', '$WEBCORE_DIR/svg/SVGElementInstanceList.cpp', @@ -538,6 +653,7 @@ input_files = [ '$WEBCORE_DIR/svg/SVGGElement.cpp', '$WEBCORE_DIR/svg/SVGGlyphElement.cpp', '$WEBCORE_DIR/svg/SVGGradientElement.cpp', + '$WEBCORE_DIR/svg/SVGHKernElement.cpp', '$WEBCORE_DIR/svg/SVGImageElement.cpp', '$WEBCORE_DIR/svg/SVGImageLoader.cpp', '$WEBCORE_DIR/svg/SVGLangSpace.cpp', @@ -591,7 +707,6 @@ input_files = [ '$WEBCORE_DIR/svg/SVGTextElement.cpp', '$WEBCORE_DIR/svg/SVGTextPathElement.cpp', '$WEBCORE_DIR/svg/SVGTextPositioningElement.cpp', - '$WEBCORE_DIR/svg/SVGTimer.cpp', '$WEBCORE_DIR/svg/SVGTitleElement.cpp', '$WEBCORE_DIR/svg/SVGTransform.cpp', '$WEBCORE_DIR/svg/SVGTransformable.cpp', @@ -605,8 +720,12 @@ input_files = [ '$WEBCORE_DIR/svg/SVGViewSpec.cpp', '$WEBCORE_DIR/svg/SVGZoomAndPan.cpp', '$WEBCORE_DIR/svg/SVGZoomEvent.cpp', - '$WEBCORE_DIR/svg/TimeScheduler.cpp', - '$PENDING_DIR/SVGImage.cpp', + + '$WEBCORE_DIR/svg/animation/SMILTime.cpp', + '$WEBCORE_DIR/svg/animation/SMILTimeContainer.cpp', + '$WEBCORE_DIR/svg/animation/SVGSMILElement.cpp', + + '$WEBCORE_DIR/svg/graphics/SVGImage.cpp', '$WEBCORE_DIR/svg/graphics/SVGPaintServer.cpp', '$WEBCORE_DIR/svg/graphics/SVGPaintServerGradient.cpp', '$WEBCORE_DIR/svg/graphics/SVGPaintServerLinearGradient.cpp', @@ -618,27 +737,13 @@ input_files = [ '$WEBCORE_DIR/svg/graphics/SVGResourceFilter.cpp', '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp', '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEBlend.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEColorMatrix.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEComponentTransfer.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEComposite.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEConvolveMatrix.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEDiffuseLighting.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEDisplacementMap.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEFlood.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEGaussianBlur.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEImage.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEMerge.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEMorphology.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFEOffset.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFESpecularLighting.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFETurbulence.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGFilterEffect.cpp', - '$WEBCORE_DIR/svg/graphics/filters/SVGLightSource.cpp', '$WEBCORE_DIR/xml/DOMParser.cpp', '$WEBCORE_DIR/xml/NativeXPathNSResolver.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/xml/XMLHttpRequest.cpp', '$PENDING_DIR/XMLHttpRequest.cpp', + '$WEBCORE_DIR/xml/XMLHttpRequestUpload.cpp', '$WEBCORE_DIR/xml/XMLSerializer.cpp', '$WEBCORE_DIR/xml/XPathEvaluator.cpp', '$WEBCORE_DIR/xml/XPathExpression.cpp', @@ -655,16 +760,20 @@ input_files = [ '$WEBCORE_DIR/xml/XPathUtil.cpp', '$WEBCORE_DIR/xml/XPathValue.cpp', '$WEBCORE_DIR/xml/XPathVariableReference.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/xml/XSLImportRule.cpp', '$PENDING_DIR/XSLImportRule.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/xml/XSLStyleSheet.cpp', '$PENDING_DIR/XSLStyleSheet.cpp', '$WEBCORE_DIR/xml/XSLTExtensions.cpp', - '$PENDING_DIR/XSLTProcessor.cpp', + '$WEBCORE_DIR/xml/XSLTProcessor.cpp', '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp', ] # These files don't compile yet on linux or mac. -if env['PLATFORM'] == 'win32': - input_files.extend([ +if env['PLATFORM'] in ('darwin', 'posix'): + remove_files = [ # includes platform specific FontCustomPlatformData.h '$WEBCORE_DIR/css/CSSFontFaceSource.cpp', '$WEBCORE_DIR/loader/CachedFont.cpp', @@ -673,30 +782,31 @@ if env['PLATFORM'] == 'win32': '$WEBCORE_DIR/editing/Editor.cpp', # Needs base/gfx/platform_device - '$PENDING_DIR/CanvasRenderingContext2D.cpp', + '$WEBCORE_DIR/html/CanvasRenderingContext2D.cpp', # Missing gtk bits. - '$PENDING_DIR/EventHandler.cpp', + '$WEBCORE_DIR/page/EventHandler.cpp', '$WEBCORE_DIR/platform/ContextMenu.cpp', '$WEBCORE_DIR/platform/FileChooser.cpp', '$WEBCORE_DIR/rendering/RenderFileUploadControl.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderMenuList.cpp', '$PENDING_DIR/RenderMenuList.cpp', - - # Need to remove cairo stub in port/platform/cairo.h. - '$PENDING_DIR/Font.cpp', - - # PlatformScrollBar needs to be ported. '$WEBCORE_DIR/rendering/HitTestResult.cpp', '$WEBCORE_DIR/rendering/RenderListBox.cpp', '$WEBCORE_DIR/rendering/RenderLayer.cpp', '$WEBCORE_DIR/rendering/RenderTheme.cpp', + # Uncomment and replace following line when the $PENDING_DIR file unforks. + #'$WEBCORE_DIR/rendering/RenderTextControl.cpp', '$PENDING_DIR/RenderTextControl.cpp', - ]) + ] + for remove in remove_files: + input_files.remove(remove) # Windows specific files. if env['PLATFORM'] == 'win32': input_files.extend([ - '$PENDING_DIR/FileSystemWin.cpp', + '$WEBCORE_DIR/platform/win/FileSystemWin.cpp', ]) # Precompiled headers only work under MSVC in scons. diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 73d225a..49eaf90 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -52,17 +52,19 @@ env = env.Clone( 'ENABLE_XSLT', 'ENABLE_XPATH', 'ENABLE_SVG', - 'ENABLE_SVG_FOREIGN_OBJECT', - 'ENABLE_SVG_USE', + 'ENABLE_SVG_ANIMATION', 'ENABLE_SVG_AS_IMAGE', 'ENABLE_SVG_FONTS', + 'ENABLE_SVG_FOREIGN_OBJECT', + 'ENABLE_SVG_USE', ], SVG_FLAGS = [ - 'ENABLE_SVG_FOREIGN_OBJECT=1', - 'ENABLE_SVG_USE=1', + 'ENABLE_SVG_ANIMATION=1', 'ENABLE_SVG_AS_IMAGE=1', 'ENABLE_SVG_FONTS=1', + 'ENABLE_SVG_FOREIGN_OBJECT=1', + 'ENABLE_SVG_USE=1', ], BINDINGS_INCLUDE_PATH = [ @@ -164,16 +166,21 @@ idl_files = [ 'css/CSSUnknownRule.idl', 'css/CSSValue.idl', 'css/CSSValueList.idl', + 'css/CSSVariablesDeclaration.idl', + 'css/CSSVariablesRule.idl', 'css/MediaList.idl', 'css/Rect.idl', 'css/RGBColor.idl', 'css/StyleSheet.idl', 'css/StyleSheetList.idl', + 'css/WebKitCSSKeyframeRule.idl', + 'css/WebKitCSSKeyframesRule.idl', + 'css/WebKitCSSTransformValue.idl', 'dom/Attr.idl', 'dom/CDATASection.idl', 'dom/CharacterData.idl', - 'dom/Clipboard.idl', # port only + 'dom/Clipboard.idl', 'dom/Comment.idl', 'dom/Document.idl', 'dom/DocumentFragment.idl', @@ -187,7 +194,7 @@ idl_files = [ 'dom/EventException.idl', 'dom/EventListener.idl', 'dom/EventTarget.idl', - 'dom/EventTargetNode.idl', # port only + 'dom/EventTargetNode.idl', 'dom/KeyboardEvent.idl', 'dom/MessageEvent.idl', 'dom/MouseEvent.idl', @@ -198,6 +205,7 @@ idl_files = [ 'dom/NodeIterator.idl', 'dom/NodeList.idl', 'dom/Notation.idl', + 'dom/NSResolver.idl', 'dom/OverflowEvent.idl', 'dom/ProcessingInstruction.idl', 'dom/ProgressEvent.idl', @@ -207,11 +215,16 @@ idl_files = [ 'dom/TextEvent.idl', 'dom/TreeWalker.idl', 'dom/UIEvent.idl', + 'dom/WebKitAnimationEvent.idl', + 'dom/WebKitTransitionEvent.idl', 'dom/WheelEvent.idl', 'html/CanvasGradient.idl', + 'html/CanvasPixelArray.idl', 'html/CanvasPattern.idl', 'html/CanvasRenderingContext2D.idl', + 'html/File.idl', + 'html/FileList.idl', 'html/HTMLAnchorElement.idl', 'html/HTMLAppletElement.idl', 'html/HTMLAreaElement.idl', @@ -264,7 +277,7 @@ idl_files = [ 'html/HTMLQuoteElement.idl', 'html/HTMLScriptElement.idl', 'html/HTMLSelectElement.idl', - 'html/HTMLSelectionInputElement.idl', # port only + 'html/HTMLSelectionInputElement.idl', 'html/HTMLSourceElement.idl', 'html/HTMLStyleElement.idl', 'html/HTMLTableCaptionElement.idl', @@ -276,54 +289,39 @@ idl_files = [ 'html/HTMLTextAreaElement.idl', 'html/HTMLTitleElement.idl', 'html/HTMLUListElement.idl', - 'html/UndetectableHTMLCollection.idl', # port only 'html/HTMLVideoElement.idl', + 'html/ImageData.idl', 'html/MediaError.idl', + 'html/TextMetrics.idl', 'html/TimeRanges.idl', + 'html/UndetectableHTMLCollection.idl', 'html/VoidCallback.idl', + # 'loader/appcache/DOMApplicationCache.idl', + 'page/AbstractView.idl', 'page/BarInfo.idl', 'page/Console.idl', 'page/DOMSelection.idl', 'page/DOMWindow.idl', 'page/History.idl', + 'page/JavaScriptCallFrame.idl', + 'page/Location.idl', + 'page/Navigator.idl', 'page/Screen.idl', - 'page/inspector/InspectorController.idl', # port only - - 'page/Navigator.idl', # port only - 'page/Location.idl', # port only - - - 'xml/DOMParser.idl', - 'xml/DOMParser.idl', - 'xml/XMLHttpRequest.idl', # port only - 'xml/XMLHttpRequestException.idl', - 'xml/XMLSerializer.idl', - 'xml/XPathEvaluator.idl', - 'xml/XPathException.idl', - 'xml/XPathExpression.idl', - 'xml/XPathNSResolver.idl', - 'xml/XPathResult.idl', - 'xml/XSLTProcessor.idl', # port only + 'page/inspector/InspectorController.idl', - 'ksvg2/svg/SVGMatrix.idl', # port only - 'ksvg2/svg/SVGPathSegList.idl', # port only - 'ksvg2/svg/SVGPointList.idl', # port only - 'ksvg2/svg/SVGTransformList.idl', # port only + 'ksvg2/svg/SVGMatrix.idl', + 'ksvg2/svg/SVGPathSegList.idl', + 'ksvg2/svg/SVGPointList.idl', + 'ksvg2/svg/SVGTransformList.idl', - 'svg/SVGLength.idl', - 'svg/SVGElement.idl', + 'svg/ElementTimeControl.idl', 'svg/SVGAElement.idl', - 'svg/SVGURIReference.idl', - 'svg/SVGRect.idl', - 'svg/SVGRectElement.idl', - 'svg/SVGRenderingIntent.idl', + 'svg/SVGAltGlyphElement.idl', 'svg/SVGAngle.idl', 'svg/SVGAnimateColorElement.idl', - 'svg/SVGAnimateElement.idl', - 'svg/SVGAnimateTransformElement.idl', 'svg/SVGAnimatedAngle.idl', 'svg/SVGAnimatedBoolean.idl', 'svg/SVGAnimatedEnumeration.idl', @@ -338,6 +336,8 @@ idl_files = [ 'svg/SVGAnimatedRect.idl', 'svg/SVGAnimatedString.idl', 'svg/SVGAnimatedTransformList.idl', + 'svg/SVGAnimateElement.idl', + 'svg/SVGAnimateTransformElement.idl', 'svg/SVGAnimationElement.idl', 'svg/SVGCircleElement.idl', 'svg/SVGClipPathElement.idl', @@ -376,25 +376,26 @@ idl_files = [ 'svg/SVGFESpotLightElement.idl', 'svg/SVGFETileElement.idl', 'svg/SVGFETurbulenceElement.idl', + 'svg/SVGFFilterElement.idl', + 'svg/SVGFFilterPrimitiveStandardAttributes.idl', + 'svg/SVGFFitToViewBox.idl', 'svg/SVGFontElement.idl', 'svg/SVGFontFaceElement.idl', 'svg/SVGFontFaceFormatElement.idl', 'svg/SVGFontFaceNameElement.idl', 'svg/SVGFontFaceSrcElement.idl', 'svg/SVGFontFaceUriElement.idl', - 'svg/SVGFilterElement.idl', - 'svg/SVGFilterPrimitiveStandardAttributes.idl', - 'svg/SVGFitToViewBox.idl', 'svg/SVGForeignObjectElement.idl', 'svg/SVGGElement.idl', - 'svg/SVGGlyphElement.idl', + 'svg/SVGGlpyhElement.idl', 'svg/SVGGradientElement.idl', + 'svg/SVGHKernElement.idl', 'svg/SVGImageElement.idl', 'svg/SVGLangSpace.idl', 'svg/SVGLength.idl', 'svg/SVGLengthList.idl', - 'svg/SVGLineElement.idl', 'svg/SVGLinearGradientElement.idl', + 'svg/SVGLineElement.idl', 'svg/SVGLocatable.idl', 'svg/SVGMarkerElement.idl', 'svg/SVGMaskElement.idl', @@ -433,17 +434,15 @@ idl_files = [ 'svg/SVGRect.idl', 'svg/SVGRectElement.idl', 'svg/SVGRenderingIntent.idl', - 'svg/SVGSVGElement.idl', 'svg/SVGScriptElement.idl', 'svg/SVGSetElement.idl', 'svg/SVGStopElement.idl', 'svg/SVGStringList.idl', 'svg/SVGStylable.idl', 'svg/SVGStyleElement.idl', + 'svg/SVGSVGElement.idl', 'svg/SVGSwitchElement.idl', 'svg/SVGSymbolElement.idl', - 'svg/SVGTRefElement.idl', - 'svg/SVGTSpanElement.idl', 'svg/SVGTests.idl', 'svg/SVGTextContentElement.idl', 'svg/SVGTextElement.idl', @@ -452,12 +451,29 @@ idl_files = [ 'svg/SVGTitleElement.idl', 'svg/SVGTransform.idl', 'svg/SVGTransformable.idl', - 'svg/SVGURIReference.idl', + 'svg/SVGTRefElement.idl', + 'svg/SVGTSpanElement.idl', 'svg/SVGUnitTypes.idl', + 'svg/SVGURIReference.idl', 'svg/SVGUseElement.idl', 'svg/SVGViewElement.idl', + 'svg/SVGViewSpec.idl', 'svg/SVGZoomAndPan.idl', 'svg/SVGZoomEvent.idl', + + 'xml/DOMParser.idl', + 'xml/DOMParser.idl', + 'xml/XMLHttpRequest.idl', + 'xml/XMLHttpRequestException.idl', + 'xml/XMLHttpRequestProgressEvent.idl', + 'xml/XMLHttpRequestUpload.idl', + 'xml/XMLSerializer.idl', + 'xml/XPathEvaluator.idl', + 'xml/XPathException.idl', + 'xml/XPathExpression.idl', + 'xml/XPathNSResolver.idl', + 'xml/XPathResult.idl', + 'xml/XSLTProcessor.idl', ] for subdir in set([os.path.dirname(n) for n in idl_files]): @@ -603,7 +619,7 @@ env.Command('$WEBKIT_PORT_DIR/CSSPropertyNames.in', env.Command(['$DERIVED_DIR/CSSValueKeywords.c', '$DERIVED_DIR/CSSValueKeywords.h'], ['$WEBKIT_PORT_DIR/css/makevalues.pl', - '$WEBKIT_PORT_DIR/css/CSSValueKeywords.in'], + '$WEBKIT_PORT_DIR/CSSValueKeywords.in'], ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}', Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'), Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'), @@ -612,7 +628,7 @@ env.Command(['$DERIVED_DIR/CSSValueKeywords.c', env.Command(['$DERIVED_DIR/CSSPropertyNames.cpp', '$DERIVED_DIR/CSSPropertyNames.h'], ['$WEBKIT_PORT_DIR/css/makeprop.pl', - '$WEBKIT_PORT_DIR/css/CSSPropertyNames.in'], + '$WEBKIT_PORT_DIR/CSSPropertyNames.in'], ['cd ${SOURCES[1].dir} && $PERL ${str(SOURCES[0].abspath).replace("\\\\", "/")}', Move('${TARGETS[0]}', '${SOURCES[1].dir}/${TARGETS[0].file}'), Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'), |