diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-06 21:41:03 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-06 21:41:03 +0000 |
| commit | da0aa3bd070047256c5f1ebfddf969a05e48d983 (patch) | |
| tree | 165b8a21b31373fed1034f5dd546ae919a52a59e /chrome/renderer/user_script_slave.cc | |
| parent | 1e1f1a7eb400cfd9094262315fc03d6a4e13fa1b (diff) | |
| download | chromium_src-da0aa3bd070047256c5f1ebfddf969a05e48d983.zip chromium_src-da0aa3bd070047256c5f1ebfddf969a05e48d983.tar.gz chromium_src-da0aa3bd070047256c5f1ebfddf969a05e48d983.tar.bz2 | |
Fix a crash bug on user script installation and add a test
to make sure it doesn't happen again.
Also, re-enable a test nearby. The history has been lost of
why this was failing, so it may fail again, but at least
we'll have data.
Finally, fix a Greasemonkey compat issue.
BUG=29298
Review URL: http://codereview.chromium.org/466053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/user_script_slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 68dec43..7ddbd71 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -189,7 +189,7 @@ bool UserScriptSlave::InjectScripts(WebFrame* frame, // We add this dumb function wrapper for standalone user script to // emulate what Greasemonkey does. - if (script->is_standalone()) { + if (script->is_standalone() || script->emulate_greasemonkey()) { content.insert(0, kUserScriptHead); content += kUserScriptTail; } |