DevTools: Make the way inspectorFrontend is referenced in agents consistent in all of them.

Source/core/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 34 matching lines @@
 namespace blink {
 
 namespace WorkerAgentState {
 static const char workerInspectionEnabled[] = "workerInspectionEnabled";
 static const char autoconnectToWorkers[] = "autoconnectToWorkers";
 };
 
 class InspectorWorkerAgent::WorkerFrontendChannel FINAL : public WorkerGlobalScopeProxy::PageInspector {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit WorkerFrontendChannel(InspectorFrontend* frontend, WorkerGlobalScopeProxy* proxy)
+    explicit WorkerFrontendChannel(InspectorFrontend::Worker* frontend, WorkerGlobalScopeProxy* proxy)
         : m_frontend(frontend)
         , m_proxy(proxy)
         , m_id(s_nextId++)
         , m_connected(false)
     {
     }
     virtual ~WorkerFrontendChannel()
     {
         disconnectFromWorkerGlobalScope();
     }
@@ skipping 20 matching lines @@
 private:
     // WorkerGlobalScopeProxy::PageInspector implementation
     virtual void dispatchMessageFromWorker(const String& message) OVERRIDE
     {
         RefPtr<JSONValue> value = parseJSON(message);
         if (!value)
             return;
         RefPtr<JSONObject> messageObject = value->asObject();
         if (!messageObject)
             return;
-        m_frontend->worker()->dispatchMessageFromWorker(m_id, messageObject);
+        m_frontend->dispatchMessageFromWorker(m_id, messageObject);
     }
 
-    InspectorFrontend* m_frontend;
+    InspectorFrontend::Worker* m_frontend;
     WorkerGlobalScopeProxy* m_proxy;
     int m_id;
     bool m_connected;
     static int s_nextId;
 };
 
 int InspectorWorkerAgent::WorkerFrontendChannel::s_nextId = 1;
 
 PassOwnPtrWillBeRawPtr<InspectorWorkerAgent> InspectorWorkerAgent::create()
 {
     return adoptPtrWillBeNoop(new InspectorWorkerAgent());
 }
 
 InspectorWorkerAgent::InspectorWorkerAgent()
     : InspectorBaseAgent<InspectorWorkerAgent>("Worker")
-    , m_inspectorFrontend(0)
+    , m_frontend(0)
 {
 }
 
 InspectorWorkerAgent::~InspectorWorkerAgent()
 {
 #if !ENABLE(OILPAN)
     m_instrumentingAgents->setInspectorWorkerAgent(0);
 #endif
 }
 
 void InspectorWorkerAgent::init()
 {
     m_instrumentingAgents->setInspectorWorkerAgent(this);
 }
 
 void InspectorWorkerAgent::setFrontend(InspectorFrontend* frontend)
 {
-    m_inspectorFrontend = frontend;
+    m_frontend = frontend->worker();
 }
 
 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_frontend = 0;
 }
 
 void InspectorWorkerAgent::enable(ErrorString*)
 {
     m_state->setBoolean(WorkerAgentState::workerInspectionEnabled, true);
-    if (!m_inspectorFrontend)
+    if (!m_frontend)
         return;
     createWorkerFrontendChannelsForExistingWorkers();
 }
 
 void InspectorWorkerAgent::disable(ErrorString*)
 {
     m_state->setBoolean(WorkerAgentState::workerInspectionEnabled, false);
-    if (!m_inspectorFrontend)
+    if (!m_frontend)
         return;
     destroyWorkerFrontendChannels();
 }
 
 void InspectorWorkerAgent::canInspectWorkers(ErrorString*, bool* result)
 {
     *result = true;
 }
 
 void InspectorWorkerAgent::connectToWorker(ErrorString* error, int workerId)
@@ skipping 38 matching lines @@
 }
 
 bool InspectorWorkerAgent::shouldPauseDedicatedWorkerOnStart()
 {
     return m_state->getBoolean(WorkerAgentState::autoconnectToWorkers);
 }
 
 void InspectorWorkerAgent::didStartWorkerGlobalScope(WorkerGlobalScopeProxy* workerGlobalScopeProxy, const KURL& url)
 {
     m_dedicatedWorkers.set(workerGlobalScopeProxy, url.string());
-    if (m_inspectorFrontend && m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
+    if (m_frontend && m_state->getBoolean(WorkerAgentState::workerInspectionEnabled))
         createWorkerFrontendChannel(workerGlobalScopeProxy, url.string());
     if (!m_tracingSessionId.isEmpty())
         workerGlobalScopeProxy->writeTimelineStartedEvent(m_tracingSessionId);
 }
 
 void InspectorWorkerAgent::workerGlobalScopeTerminated(WorkerGlobalScopeProxy* proxy)
 {
     m_dedicatedWorkers.remove(proxy);
     for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
         if (proxy == it->value->proxy()) {
-            m_inspectorFrontend->worker()->workerTerminated(it->key);
+            m_frontend->workerTerminated(it->key);
             delete it->value;
             m_idToChannel.remove(it);
             return;
         }
     }
 }
 
 void InspectorWorkerAgent::createWorkerFrontendChannelsForExistingWorkers()
 {
     for (DedicatedWorkers::iterator it = m_dedicatedWorkers.begin(); it != m_dedicatedWorkers.end(); ++it)
         createWorkerFrontendChannel(it->key, it->value);
 }
 
 void InspectorWorkerAgent::destroyWorkerFrontendChannels()
 {
     for (WorkerChannels::iterator it = m_idToChannel.begin(); it != m_idToChannel.end(); ++it) {
         it->value->disconnectFromWorkerGlobalScope();
         delete it->value;
     }
     m_idToChannel.clear();
 }
 
 void InspectorWorkerAgent::createWorkerFrontendChannel(WorkerGlobalScopeProxy* workerGlobalScopeProxy, const String& url)
 {
-    WorkerFrontendChannel* channel = new WorkerFrontendChannel(m_inspectorFrontend, workerGlobalScopeProxy);
+    WorkerFrontendChannel* channel = new WorkerFrontendChannel(m_frontend, workerGlobalScopeProxy);
     m_idToChannel.set(channel->id(), channel);
 
-    ASSERT(m_inspectorFrontend);
+    ASSERT(m_frontend);
     bool autoconnectToWorkers = m_state->getBoolean(WorkerAgentState::autoconnectToWorkers);
     if (autoconnectToWorkers)
         channel->connectToWorkerGlobalScope();
-    m_inspectorFrontend->worker()->workerCreated(channel->id(), url, autoconnectToWorkers);
+    m_frontend->workerCreated(channel->id(), url, autoconnectToWorkers);
 }
 
 } // namespace blink