Commit e7700419 authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix OnScreenKeyboard crash on windows ASAN debug build

Change Assert to STA from MTA. Add comment and bug describing that
WinRT use really should be in a MTA, but currently is on the UI thread
which is STA.

BUG=852317,852386

Change-Id: I3a284010638ae848b1e9b5ee6c92646a5a9a1dea
Reviewed-on: https://chromium-review.googlesource.com/1099184Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566910}
parent 69beedd1
......@@ -86,7 +86,10 @@ bool OnScreenKeyboardDisplayManagerInputPane::EnsureInputPanePointers() {
return false;
}
base::win::AssertComApartmentType(base::win::ComApartmentType::MTA);
// TODO(dtapuska): https://crbug.com/852386. Use TaskScheduler to access the
// WinRT APIs.
base::win::AssertComApartmentType(base::win::ComApartmentType::STA);
base::win::ScopedHString input_pane_guid = base::win::ScopedHString::Create(
RuntimeClass_Windows_UI_ViewManagement_InputPane);
Microsoft::WRL::ComPtr<IInputPaneInterop> input_pane_interop;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment