summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript19
-rw-r--r--webkit/build/JavaScriptCore/SConscript23
-rw-r--r--webkit/build/port/SConscript16
-rw-r--r--webkit/pending/ExceptionContext.h3
4 files changed, 38 insertions, 23 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 1f5d024..c071871 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -114,6 +114,15 @@ env.Append(
DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"),
SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"),
+ # This is a stop gap to get linux building in time for the webkit
+ # merge. The true fix is to move the above CPPPATH prepend under this
+ # Append block and remove all the old pending directories (and add the new
+ # upstream ones.)
+ CPPPATH = [
+ '$WEBCORE_DIR/rendering',
+ '$WEBCORE_DIR/rendering/style',
+ ],
+
CPPDEFINES = [
'U_STATIC_IMPLEMENTATION',
'_SCL_SECURE_NO_DEPRECATE',
@@ -129,12 +138,11 @@ env.Append(
['ANDROID_CANVAS_IMPL', '1'],
['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'],
'USE_GOOGLE_URL_LIBRARY',
- # TODO: Uncomment this when building the merged WebKit,
- # so it uses the PLATFORM_SKIA definitions instead of
- # the old cairo.h shim.
- #'BUILDING_CHROMIUM__',
+ 'BUILDING_CHROMIUM__',
'CHROMIUM_BUILD',
+ 'WTF_USE_ICU_UNICODE',
'_SECURE_ATL',
+ 'QNAME_DEFAULT_CONSTRUCTOR',
'LIBXSLT_STATIC',
'LIBXML_STATIC',
@@ -143,7 +151,6 @@ env.Append(
['__PRETTY_FUNCTION__', '__FUNCTION__'],
'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2',
- 'HAVE_CONFIG_H',
'__STD_C',
],
)
@@ -191,6 +198,7 @@ if env['PLATFORM'] == 'win32':
])
else:
env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'])
+
env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
# Setup alias for all webkit related targets.
@@ -203,7 +211,6 @@ env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
if env['PLATFORM'] == 'win32':
env.Alias('webkit', ['../icudt38.dll'])
-
version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
['$WEBCORE_DIR/Configurations/Version.xcconfig',
'#/../webkit/build/webkit_version.py'],
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index ba5cb99..97534f7 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -20,11 +20,17 @@ env.Replace(
CREATE_HASH_TABLE_FLAGS = '-i',
)
+# TODO(erg): Temporarily disabling JSC building since it's changed heavily
+# during the merge; I am also not sure we want/need to build it when building
+# V8...
+#
+# We still need to build the pieces of pcre so we can't just drop this
+# SConscript file though... <http://crbug.com/3043>
+"""
env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM',
suffix = '.lut.h',
src_suffix = '.cpp')
-
inputs = [
'array_object',
'date_object',
@@ -39,6 +45,7 @@ for i in inputs:
env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
CREATE_HASH_TABLE_FLAGS='')
+"""
# TODO(bradnelson): sucks, needs relative path
env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
@@ -68,13 +75,13 @@ copies = [
'API/JSStringRefCF.h',
'API/JSStringRefBSTR.h',
'API/JavaScriptCore.h',
- 'bindings/npruntime.h',
- 'bindings/runtime.h',
- 'bindings/NP_jsobject.h',
- 'bindings/npruntime_internal.h',
- 'bindings/npruntime_impl.h',
- 'bindings/runtime_object.h',
- 'bindings/runtime_root.h',
+ '../WebCore/bridge/npruntime.h',
+ '../WebCore/bridge/runtime.h',
+ '../WebCore/bridge/NP_jsobject.h',
+ '../WebCore/bridge/npruntime_internal.h',
+ '../WebCore/bridge/npruntime_impl.h',
+ '../WebCore/bridge/runtime_object.h',
+ '../WebCore/bridge/runtime_root.h',
'kjs/collector.h',
'kjs/JSLock.h',
'kjs/interpreter.h',
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index ca73194..73d225a 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -42,7 +42,7 @@ env = env.Clone(
BINDINGS_SCRIPTS_DIR = '$WEBKIT_DIR/port/bindings/scripts',
BINDINGS_SCRIPT = '$BINDINGS_SCRIPTS_DIR/generate-bindings.pl',
- PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR',
+ PERL_INCLUDE_PATH = ['$BINDINGS_SCRIPTS_DIR',
'#/../third_party/WebKit/WebCore/bindings/scripts'],
WEBKIT_PORT_DIR = '$WEBKIT_DIR/port',
@@ -477,15 +477,13 @@ i = env.Install('$SHARED_DIR',
'$WEBKIT_PORT_DIR/bindings/js/PausedTimeouts.cpp'])
env.Alias('webkit', i)
-
-
# HTML tag and attribute names
env.Command(['$DERIVED_DIR/HTMLNames.cpp',
'$DERIVED_DIR/HTMLNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/html/HTMLTagNames.in',
'$WEBKIT_PORT_DIR/html/HTMLAttributeNames.in'],
- '$PERL ${SOURCES[0].posix} ' + \
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
'--tags ${SOURCES[1].posix} ' + \
'--attrs ${SOURCES[2].posix} ' + \
'--namespace HTML --namespacePrefix xhtml ' + \
@@ -497,7 +495,7 @@ env.Command(['$DERIVED_DIR/XMLNames.cpp',
'$DERIVED_DIR/XMLNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/xml/xmlattrs.in'],
- '$PERL ${SOURCES[0].posix} ' + \
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
'--attrs ${SOURCES[1].posix} ' + \
'--namespace XML --cppNamespace WebCore ' + \
'--namespaceURI "http://www.w3.org/XML/1998/namespace" ' + \
@@ -510,7 +508,7 @@ env.Command(['$DERIVED_DIR/SVGElementFactory.cpp',
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/svg/svgtags.in',
'$WEBKIT_PORT_DIR/svg/svgattrs.in'],
- '$PERL ${SOURCES[0].posix} ' + \
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
'--tags ${SOURCES[1].posix} ' + \
'--attrs ${SOURCES[2].posix} ' + \
'--extraDefines "$SVG_FLAGS" ' + \
@@ -522,7 +520,7 @@ env.Command(['$DERIVED_DIR/XLinkNames.cpp',
'$DERIVED_DIR/XLinkNames.h'],
['$WEBKIT_PORT_DIR/dom/make_names.pl',
'$WEBKIT_PORT_DIR/svg/xlinkattrs.in'],
- '$PERL ${SOURCES[0].posix} ' + \
+ '$PERL $_PERL_INCLUDE_FLAGS ${SOURCES[0].posix} ' + \
'--attrs ${SOURCES[1].posix} ' + \
'--namespace XLink --cppNamespace WebCore ' + \
'--namespaceURI "http://www.w3.org/1999/xlink" ' + \
@@ -611,7 +609,7 @@ env.Command(['$DERIVED_DIR/CSSValueKeywords.c',
Move('${TARGETS[1]}', '${SOURCES[1].dir}/${TARGETS[1].file}'),
])
-env.Command(['$DERIVED_DIR/CSSPropertyNames.c',
+env.Command(['$DERIVED_DIR/CSSPropertyNames.cpp',
'$DERIVED_DIR/CSSPropertyNames.h'],
['$WEBKIT_PORT_DIR/css/makeprop.pl',
'$WEBKIT_PORT_DIR/css/CSSPropertyNames.in'],
@@ -649,4 +647,4 @@ env.Command('$DERIVED_DIR/HTMLEntityCodes.c',
env.Command('$DERIVED_DIR/tokenizer.cpp',
['$WEBKIT_PORT_DIR/css/tokenizer.flex',
'$WEBKIT_PORT_DIR/css/maketokenizer'],
- 'flex -t $SOURCE | perl ${SOURCES[1]} > $TARGET')
+ 'flex --nowarn -t $SOURCE | perl ${SOURCES[1]} > $TARGET')
diff --git a/webkit/pending/ExceptionContext.h b/webkit/pending/ExceptionContext.h
index 75712ac..7b6c1b4 100644
--- a/webkit/pending/ExceptionContext.h
+++ b/webkit/pending/ExceptionContext.h
@@ -38,6 +38,9 @@
namespace WebCore {
class Node;
+#if USE(V8)
+class ExceptionCatcher;
+#endif
// Provides context of an exception. This class is an abstraction of JSC's
// ExecState. In V8, its purpose is to carry along the exceptions captured
generated by cgit v1.1 at 2025-02-02 06:32:25 +0000