Merge 133569 - Web Inspector: JavaScript web workers debugging crashes

Source/WebCore/inspector/InspectorWorkerAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
 public:
     explicit WorkerFrontendChannel(InspectorFrontend* frontend, WorkerContextProxy* proxy)
         : m_frontend(frontend)
         , m_proxy(proxy)
         , m_id(s_nextId++)
         , m_connected(false)
     {
     }
     virtual ~WorkerFrontendChannel()
     {
+        disconnectFromWorkerContext();
     }
 
     int id() const { return m_id; }
     WorkerContextProxy* proxy() const { return m_proxy; }
 
     void connectToWorkerContext()
     {
         if (m_connected)
             return;
         m_connected = true;
@@ skipping 53 matching lines @@
 }
 
 void InspectorWorkerAgent::restore()
 {
     if (m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
         createWorkerFrontendChannelsForExistingWorkers();
 }
 
 void InspectorWorkerAgent::clearFrontend()
 {
+    m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
+    disable(0);
     m_inspectorFrontend = 0;
-    m_state->setBoolean(WorkerAgentState::autoconnectToWorkers, false);
-    destroyWorkerFrontendChannels();
 }
 
 void InspectorWorkerAgent::enable(ErrorString*)
 {
     m_state->setBoolean(WorkerAgentState::workerInspectionEnabled, true);
     if (!m_inspectorFrontend)
         return;
     createWorkerFrontendChannelsForExistingWorkers();
 }
 
@@ skipping 85 matching lines @@
     ASSERT(m_inspectorFrontend);
     bool autoconnectToWorkers = m_state->getBoolean(WorkerAgentState::autoconnectToWorkers);
     if (autoconnectToWorkers)
         channel->connectToWorkerContext();
     m_inspectorFrontend->worker()->workerCreated(channel->id(), url, autoconnectToWorkers);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS) && ENABLE(INSPECTOR)