diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 20:33:29 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 20:33:29 +0000 |
| commit | 5792d936fb199d7875e7670e82f812fc2c7bee51 (patch) | |
| tree | 6de3429fddaa34a30e0d1ebf93e4476d0a456ce1 /chrome/renderer/navigation_state.cc | |
| parent | 5e8bfe45ebc244188e836fd1c349da683be7fd63 (diff) | |
| download | chromium_src-5792d936fb199d7875e7670e82f812fc2c7bee51.zip chromium_src-5792d936fb199d7875e7670e82f812fc2c7bee51.tar.gz chromium_src-5792d936fb199d7875e7670e82f812fc2c7bee51.tar.bz2 | |
Fix race condition where chrome.tabs.executeScript sometimes wouldn't
inject scripts.
This is done by reusing the same UserScriptIdleScheduler for reference fragment navigations.
BUG=64093
TEST=See bug for repro.
Review URL: http://codereview.chromium.org/6099013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/navigation_state.cc')
| -rw-r--r-- | chrome/renderer/navigation_state.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/navigation_state.cc b/chrome/renderer/navigation_state.cc index 49ee7a7..47759f8 100644 --- a/chrome/renderer/navigation_state.cc +++ b/chrome/renderer/navigation_state.cc @@ -15,6 +15,11 @@ void NavigationState::set_user_script_idle_scheduler( user_script_idle_scheduler_.reset(scheduler); } +void NavigationState::swap_user_script_idle_scheduler( + NavigationState* state) { + user_script_idle_scheduler_.swap(state->user_script_idle_scheduler_); +} + void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) { password_form_data_.reset(data); } |