diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 21:53:00 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 21:53:00 +0000 |
commit | 8fead9b6d8ec131f11d5fe638340cda8b6e1bb48 (patch) | |
tree | 638e5f7c5e9c683e7d3dccba52c6b04e326d9d7d | |
parent | 10f92ad326ee8b42f2cdba4f4b471c516c18e281 (diff) | |
download | chromium_src-8fead9b6d8ec131f11d5fe638340cda8b6e1bb48.zip chromium_src-8fead9b6d8ec131f11d5fe638340cda8b6e1bb48.tar.gz chromium_src-8fead9b6d8ec131f11d5fe638340cda8b6e1bb48.tar.bz2 |
Removing --enable-video and instead relying on having DLLs present.
I measured a ~10ms startup regression when the DLLs are not present and a ~20ms
regression when the DLLs are present and loaded in render_process.cc.
Not sure how else to tackle this problem since we need these DLLs loaded before
the sandbox is engaged.
Review URL: http://codereview.chromium.org/63101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13542 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 1 | ||||
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_process.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_switches.cc | 3 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_switches.h | 1 |
7 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 141bf3e..486f91d 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -266,7 +266,6 @@ bool BrowserRenderProcessHost::Init() { switches::kSilentDumpOnDCHECK, switches::kDisablePopupBlocking, switches::kUseLowFragHeapCrt, - switches::kEnableVideo, switches::kEnableWebWorkers, switches::kEnableStatsTable, switches::kEnableExtensions, diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index a7691742..4ec169e 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -376,9 +376,6 @@ const wchar_t kIncognito[] = L"incognito"; // http://b/issue?id=1432077 is fixed. const wchar_t kEnableRendererAccessibility[] = L"enable-renderer-accessibility"; -// Enable HTML5 Video/Audio tag support -const wchar_t kEnableVideo[] = L"enable-video"; - // Pass the name of the current running automated test to Chrome. const wchar_t kTestName[] = L"test-name"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index bd77523..2ec310d 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -142,8 +142,6 @@ extern const wchar_t kIncognito[]; extern const wchar_t kEnableRendererAccessibility[]; -extern const wchar_t kEnableVideo[]; - extern const wchar_t kTestName[]; extern const wchar_t kRendererCmdPrefix[]; diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index e8af233..52043db 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -140,7 +140,7 @@ void RenderProcess::Init() { StatisticsRecorder::set_dump_on_exit(true); } - if (command_line.HasSwitch(switches::kEnableVideo) && LoadFFmpeg()) { + if (LoadFFmpeg()) { webkit_glue::SetMediaPlayerAvailable(true); } } diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 60ea705..d409d8e 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -237,7 +237,7 @@ int main(int argc, char* argv[]) { base::MemoryDebug::DumpAllMemoryInUse(); } - if (parsed_command_line.HasSwitch(test_shell::kEnableVideo)) { + if (false) { // TODO(scherkus): check for any DLL dependencies. webkit_glue::SetMediaPlayerAvailable(true); } diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc index 04e65d0..0884929 100644 --- a/webkit/tools/test_shell/test_shell_switches.cc +++ b/webkit/tools/test_shell/test_shell_switches.cc @@ -64,9 +64,6 @@ const wchar_t kAllowScriptsToCloseWindows[] = L"allow-scripts-to-close-windows"; extern const wchar_t kCheckLayoutTestSystemDeps[] = L"check-layout-test-sys-deps"; -// Enable the media player by having this switch. -extern const wchar_t kEnableVideo[] = L"enable-video"; - // If set, we are running under GDB so allow a certain class of errors // to happen even if in layout test mode. extern const wchar_t kGDB[] = L"gdb"; diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h index e23abbb..be995d1 100644 --- a/webkit/tools/test_shell/test_shell_switches.h +++ b/webkit/tools/test_shell/test_shell_switches.h @@ -28,7 +28,6 @@ extern const wchar_t kEnableFileCookies[]; extern const wchar_t kEnableTracing[]; extern const wchar_t kAllowScriptsToCloseWindows[]; extern const wchar_t kCheckLayoutTestSystemDeps[]; -extern const wchar_t kEnableVideo[]; extern const wchar_t kGDB[]; extern const wchar_t kProfiler[]; |