diff options
| -rw-r--r-- | chrome/browser/SConscript | 2 | ||||
| -rw-r--r-- | net/SConscript | 2 | ||||
| -rw-r--r-- | sandbox/src/SConscript | 26 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 1 |
4 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index 96b73b7..df7e536 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -138,7 +138,6 @@ input_files = [ 'cancelable_request.cc',
'cert_store.cc',
'character_encoding.cc',
- 'chrome_frame.cc',
'chrome_plugin_browsing_context.cc',
'chrome_plugin_host.cc',
'chrome_thread.cc',
@@ -168,6 +167,7 @@ input_files = [ 'firefox_importer_utils.cc',
'firefox_profile_lock.cc',
'first_run.cc',
+ 'frame_util.cc',
'frame_view.cc',
'gears_integration.cc',
'google_url_tracker.cc',
diff --git a/net/SConscript b/net/SConscript index 4ec434e..5f52b01 100644 --- a/net/SConscript +++ b/net/SConscript @@ -122,7 +122,7 @@ input_files = [ 'url_request/url_request_file_job.cc',
'url_request/url_request_filter.cc',
'url_request/url_request_ftp_job.cc',
- 'url_request/url_request_http_cache_job.cc',
+ 'url_request/url_request_http_job.cc',
'url_request/url_request_inet_job.cc',
'url_request/url_request_job.cc',
'url_request/url_request_job_manager.cc',
diff --git a/sandbox/src/SConscript b/sandbox/src/SConscript index 8c4e774..7b26d3a 100644 --- a/sandbox/src/SConscript +++ b/sandbox/src/SConscript @@ -223,9 +223,9 @@ env_unit_tests.Append(CCPCHFLAGS = ['/FIstdafx.h']) unit_tests = env_unit_tests.Program(
- ['../sandbox_unit_tests.exe',
- '../sandbox_unit_tests.ilk',
- '../sandbox_unit_tests.pdb'],
+ ['../sbox_unittests.exe',
+ '../sbox_unittests.ilk',
+ '../sbox_unittests.pdb'],
unit_test_files + extra_libs,
)
@@ -267,11 +267,11 @@ env_integration_tests['PCHSTOP'] = 'stdafx.h' env_integration_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
integration_tests = env_integration_tests.Program(
- ['../integration_tests.exe',
- '../integration_tests.ilk',
- '../integration_tests.lib',
- '../integration_tests.exp',
- '../integration_tests.pdb'],
+ ['../sbox_integration_tests.exe',
+ '../sbox_integration_tests.ilk',
+ '../sbox_integration_tests.lib',
+ '../sbox_integration_tests.exp',
+ '../sbox_integration_tests.pdb'],
integration_test_files + extra_libs,
)
@@ -306,11 +306,11 @@ env_validation_tests['PCHSTOP'] = 'stdafx.h' env_validation_tests.Append(CCPCHFLAGS = ['/FIstdafx.h'])
validation_tests = env_validation_tests.Program(
- ['../validation_tests.exe',
- '../validation_tests.ilk',
- '../validation_tests.lib',
- '../validation_tests.exp',
- '../validation_tests.pdb'],
+ ['../sbox_validation_tests.exe',
+ '../sbox_validation_tests.ilk',
+ '../sbox_validation_tests.lib',
+ '../sbox_validation_tests.exp',
+ '../sbox_validation_tests.pdb'],
validation_test_files + extra_libs,
)
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index b53b8c1..c74ae9c 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -58,6 +58,7 @@ env = env.Clone( WEBKIT_PORT_DIR = '$WEBKIT_DIR/port',
FEATURE_DEFINES = [
+ 'ENABLE_CROSS_DOCUMENT_MESSAGING',
'ENABLE_XSLT',
'ENABLE_XPATH',
'ENABLE_SVG',
|