diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/worker_host/message_port_dispatcher.cc | 5 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/worker_host/message_port_dispatcher.cc b/chrome/browser/worker_host/message_port_dispatcher.cc index f6e2bbf..070ea3d 100644 --- a/chrome/browser/worker_host/message_port_dispatcher.cc +++ b/chrome/browser/worker_host/message_port_dispatcher.cc @@ -237,6 +237,11 @@ void MessagePortDispatcher::OnSendQueuedMessages( void MessagePortDispatcher::SendQueuedMessagesIfPossible(int message_port_id) { DCHECK(CheckMessagePortMap(true)); + if (!message_ports_.count(message_port_id)) { + NOTREACHED(); + return; + } + MessagePort& port = message_ports_[message_port_id]; if (port.queue_messages || !port.sender) return; diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index fc7c276..1abc538 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -229,11 +229,6 @@ TEST_F(WorkerTest, WorkerContextGc) { RunWorkerFastLayoutTest("worker-context-gc.html"); } -// All kinds of crashes on Linux http://crbug.com/22898 -#if defined(OS_LINUX) -#define WorkerContextMultiPort DISABLED_WorkerContextMultiPort -#endif - TEST_F(WorkerTest, WorkerContextMultiPort) { RunWorkerFastLayoutTest("worker-context-multi-port.html"); } |