diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:10:15 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:10:15 +0000 |
| commit | 80c2e778b3f47fcc71ef09e10e6d595a25c81daa (patch) | |
| tree | a6ec4ef7c9296a8df42a38bfb01a2e2f96a69820 /content/shell | |
| parent | fc642ec6bb1192fef3ff85aafba345a802c06f3d (diff) | |
| download | chromium_src-80c2e778b3f47fcc71ef09e10e6d595a25c81daa.zip chromium_src-80c2e778b3f47fcc71ef09e10e6d595a25c81daa.tar.gz chromium_src-80c2e778b3f47fcc71ef09e10e6d595a25c81daa.tar.bz2 | |
[content shell] allow universal access from file URLs in layout tests
BUG=111316
TEST=compositing/iframes/iframe-in-composited-layer.html does not time out
Review URL: https://chromiumcodereview.appspot.com/11116013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_main_delegate.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index ad1abcc..97ad101 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -88,6 +88,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { InitLogging(); if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kAllowUniversalAccessFromFiles); + CommandLine::ForCurrentProcess()->AppendSwitch( switches::kAllowFileAccessFromFiles); CommandLine::ForCurrentProcess()->AppendSwitch( switches::kForceCompositingMode); |