diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 04:29:15 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 04:29:15 +0000 |
commit | 61cd852a6fd0ecc6454a2df1030fa55e580a3d1e (patch) | |
tree | 060ef13df1f6a534b11c2ffc4ce025ac145ee41b /remoting/host/local_input_monitor_win.cc | |
parent | d68bbd5dd956b7e8593e4410d15931ff6f8c1aca (diff) | |
download | chromium_src-61cd852a6fd0ecc6454a2df1030fa55e580a3d1e.zip chromium_src-61cd852a6fd0ecc6454a2df1030fa55e580a3d1e.tar.gz chromium_src-61cd852a6fd0ecc6454a2df1030fa55e580a3d1e.tar.bz2 |
Revert 201955 "Allow multiple base::MessagePumpForUI instances t..."
Broke browser_tests on XP Tests (dbg)(4):
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%284%29/builds/33253
[844:3260:0523/194017:1212046:FATAL:message_window.cc(28)] Check failed: CalledOnValidThread().
Backtrace:
base::Histogram::GetCountAndBucketData [0x08408FD1+2262176]
base::Histogram::GetCountAndBucketData [0x0827FBBE+651405]
base::Histogram::GetCountAndBucketData [0x082E1E60+1053487]
base::Histogram::GetCountAndBucketData [0x0825CC46+508181]
base::Histogram::GetCountAndBucketData [0x0825BB66+503861]
base::Histogram::GetCountAndBucketData [0x0825A534+498179]
base::Histogram::GetCountAndBucketData [0x08256C16+483557]
base::Histogram::GetCountAndBucketData [0x08256C82+483665]
base::Histogram::GetCountAndBucketData [0x08256324+481267]
base::Histogram::GetCountAndBucketData [0x081F59AF+85630]
base::Histogram::GetCountAndBucketData [0x081F84AC+96635]
base::Histogram::GetCountAndBucketData [0x081F5917+85478]
base::Histogram::GetCountAndBucketData [0x08249FD3+431266]
base::Histogram::GetCountAndBucketData [0x08249255+427812]
base::Histogram::GetCountAndBucketData [0x082462CD+415644]
base::Histogram::GetCountAndBucketData [0x0831D883+1297746]
base::Histogram::GetCountAndBucketData [0x0831D602+1297105]
ViewHostMsg_TextInputStateChanged::Read [0x0D3DD6F9+6214944]
ViewHostMsg_TextInputStateChanged::Read [0x0D3DD584+6214571]
ViewHostMsg_TextInputStateChanged::Read [0x0D33048E+5505717]
ViewHostMsg_TextInputStateChanged::Read [0x0D3303FA+5505569]
ViewHostMsg_TextInputStateChanged::Read [0x0D32DDEA+5495825]
ViewHostMsg_TextInputStateChanged::Read [0x0D32BAC7+5486830]
ViewHostMsg_TextInputStateChanged::Read [0x0D3DC9B6+6211549]
ViewHostMsg_TextInputStateChanged::Read [0x0D367071+5729944]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x03E93429+30896697]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x025BD0DF+4853487]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x02701C3F+6183503]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x026EECCB+6105819]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x026EF6DD+6108397]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x026EFEAF+6110399]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x026F673D+6137165]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x02702637+6186055]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x026F4FA0+6131120]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x0262E070+5316224]
(No symbol) [0x00632BF5]
RelaunchChromeBrowserWithNewCommandLineIfNeeded [0x03E2BD73+30473091]
(No symbol) [0x00632975]
std::_Init_locks::operator= [0x03F5574F+5791]
std::_Init_locks::operator= [0x03F5557F+5327]
RegisterWaitForInputIdle [0x7C817077+73]
> Allow multiple base::MessagePumpForUI instances to be created simultanenously on Windows.
>
> The current implementation of base::MessagePumpForUI on Windows registers a window class with a predefined name in order to create a message-only window. The window class is unregistered when base::MessagePumpForUI is deleted. This causes issues when two or more instances of base::MessagePumpForUI are created/destroyed simultanenously on different threads. For instance once thread can unregister the window class right before the other thread is trying to create a window using this class.
>
> The CL addresses this problem by switching MessageWindow to implement a message-only window. It also moves MessageWindow from remoting/host/win to base/win along with the corresponding unit test.
>
> MessageWindow registers a uniquely named window class per MessageWindow instance making sure that different MessageWindow objects do not share any resources. In the future this can be optimized further by registering a common window class shared by all MessageWindow objects in a thread-safe manner (by using LazyInstance for example).
>
> BUG=241939
>
> Review URL: https://chromiumcodereview.appspot.com/15261005
TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/15973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/local_input_monitor_win.cc')
-rw-r--r-- | remoting/host/local_input_monitor_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/local_input_monitor_win.cc b/remoting/host/local_input_monitor_win.cc index 5d4ce8c..98cd8a4 100644 --- a/remoting/host/local_input_monitor_win.cc +++ b/remoting/host/local_input_monitor_win.cc @@ -11,8 +11,8 @@ #include "base/single_thread_task_runner.h" #include "base/stringprintf.h" #include "base/threading/non_thread_safe.h" -#include "base/win/message_window.h" #include "remoting/host/client_session_control.h" +#include "remoting/host/win/message_window.h" #include "third_party/skia/include/core/SkPoint.h" namespace remoting { @@ -37,7 +37,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe, private: // The actual implementation resides in LocalInputMonitorWin::Core class. class Core : public base::RefCountedThreadSafe<Core>, - public base::win::MessageWindow::Delegate { + public win::MessageWindow::Delegate { public: Core(scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, @@ -56,7 +56,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe, // Handles WM_INPUT messages. LRESULT OnInput(HRAWINPUT input_handle); - // base::win::MessageWindow::Delegate interface. + // win::MessageWindow::Delegate interface. virtual bool HandleMessage(HWND hwnd, UINT message, WPARAM wparam, @@ -70,7 +70,7 @@ class LocalInputMonitorWin : public base::NonThreadSafe, scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; // Used to receive raw input. - scoped_ptr<base::win::MessageWindow> window_; + scoped_ptr<win::MessageWindow> window_; // Points to the object receiving mouse event notifications. base::WeakPtr<ClientSessionControl> client_session_control_; @@ -127,7 +127,7 @@ LocalInputMonitorWin::Core::~Core() { void LocalInputMonitorWin::Core::StartOnUiThread() { DCHECK(ui_task_runner_->BelongsToCurrentThread()); - window_.reset(new base::win::MessageWindow()); + window_.reset(new win::MessageWindow()); if (!window_->Create(this)) { LOG_GETLASTERROR(ERROR) << "Failed to create the raw input window"; window_.reset(); |