From da0aa3bd070047256c5f1ebfddf969a05e48d983 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Sun, 6 Dec 2009 21:41:03 +0000 Subject: 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 --- chrome/renderer/user_script_slave.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/renderer/user_script_slave.cc') 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; } -- cgit v1.1