Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1123)

Unified Diff: webkit/default_plugin/plugin_impl.cc

Issue 18824: thread.cc race fix take 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/default_plugin/plugin_impl.cc
===================================================================
--- webkit/default_plugin/plugin_impl.cc (revision 8505)
+++ webkit/default_plugin/plugin_impl.cc (working copy)
@@ -39,12 +39,13 @@
underline_font_(NULL),
tooltip_(NULL),
activex_installer_(NULL),
+ installation_job_monitor_thread_(new PluginInstallationJobMonitorThread()),
jeremy 2009/01/26 23:00:34 >80 chars
John Grabowski 2009/01/27 00:31:25 Fixed
plugin_database_handler_(*this),
plugin_download_url_for_display_(false) {
}
PluginInstallerImpl::~PluginInstallerImpl() {
- installation_job_monitor_thread_.Stop();
+ installation_job_monitor_thread_->Stop();
if (bold_font_)
::DeleteObject(bold_font_);
@@ -77,7 +78,7 @@
return false;
}
- if (!installation_job_monitor_thread_.Initialize()) {
+ if (!installation_job_monitor_thread_->Initialize()) {
DLOG(ERROR) << "Failed to initialize plugin install job";
NOTREACHED();
return false;
@@ -335,7 +336,7 @@
::GetClientRect(parent_window, &parent_rect);
Create(parent_window, parent_rect, NULL, WS_CHILD | WS_BORDER);
DCHECK(IsWindow());
- installation_job_monitor_thread_.set_plugin_window(m_hWnd);
+ installation_job_monitor_thread_->set_plugin_window(m_hWnd);
CreateToolTip();
UpdateToolTip();
@@ -637,7 +638,7 @@
} else {
DLOG(INFO) << "Successfully launched plugin installer";
set_plugin_installer_state(PluginInstallerLaunchSuccess);
- installation_job_monitor_thread_.AssignProcessToJob(
+ installation_job_monitor_thread_->AssignProcessToJob(
shell_execute_info.hProcess);
DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
enable_click_ = true;

Powered by Google App Engine
This is Rietveld 408576698