DevTools: reduce ResourceAgent dependency on PageAgent.

Source/core/inspector/InspectorResourceAgent.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 24 matching lines @@
 #include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "core/FetchInitiatorTypeNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/frame/LocalFrame.h"
+#include "core/inspector/EditedResourcesContentManager.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectorOverlay.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/inspector/NetworkResourcesData.h"
 #include "core/inspector/ScriptAsyncCallStack.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/DocumentThreadableLoader.h"
@@ skipping 239 matching lines @@
         ErrorString error;
         disable(&error);
     }
     ASSERT(!m_instrumentingAgents->inspectorResourceAgent());
 #endif
 }
 
 void InspectorResourceAgent::trace(Visitor* visitor)
 {
     visitor->trace(m_pageAgent);
+    visitor->trace(m_editedResourcesContentManager);
 #if ENABLE(OILPAN)
     visitor->trace(m_pendingXHRReplayData);
     visitor->trace(m_replayXHRs);
     visitor->trace(m_replayXHRsToBeDeleted);
 #endif
     InspectorBaseAgent::trace(visitor);
 }
 
 void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo)
 {
@@ skipping 524 matching lines @@
 void InspectorResourceAgent::frameClearedScheduledNavigation(LocalFrame* frame)
 {
     m_frameNavigationInitiatorMap.remove(m_pageAgent->frameId(frame));
 }
 
 void InspectorResourceAgent::setHostId(const String& hostId)
 {
     m_hostId = hostId;
 }
 
 bool InspectorResourceAgent::fetchResourceContent(Document* document, const KURL& url, String* content, bool* base64Encoded)

[vsevik, 2014/08/08 11:40:59]

This is only used in InspectorStyleSheet. It might be easier to simply move this
first if-branch there and get rid of editedResourcesContentManager  here
completely.

[eustas, 2014/08/08 14:03:07]

Done.

 {
-    if (m_pageAgent->getEditedResourceContent(url, content)) {
+    if (m_editedResourcesContentManager->get(url, content)) {
         *base64Encoded = false;
         return true;
     }
 
     // First try to fetch content from the cached resource.
     Resource* cachedResource = document->fetcher()->cachedResource(url);
     if (!cachedResource)
         cachedResource = memoryCache()->resourceForURL(url);
     if (cachedResource && InspectorPageAgent::cachedResourceContent(cachedResource, content, base64Encoded))
         return true;
 
     // Then fall back to resource data.
     Vector<NetworkResourcesData::ResourceData*> resources = m_resourcesData->resources();
     for (Vector<NetworkResourcesData::ResourceData*>::iterator it = resources.begin(); it != resources.end(); ++it) {
         if ((*it)->url() == url) {
             *content = (*it)->content();
             *base64Encoded = (*it)->base64Encoded();
             return true;
         }
     }
     return false;
 }
 
 void InspectorResourceAgent::removeFinishedReplayXHRFired(Timer<InspectorResourceAgent>*)
 {
     m_replayXHRsToBeDeleted.clear();
 }
 
-InspectorResourceAgent::InspectorResourceAgent(InspectorPageAgent* pageAgent)
+InspectorResourceAgent::InspectorResourceAgent(InspectorPageAgent* pageAgent, EditedResourcesContentManager* editedResourcesContentManager)
     : InspectorBaseAgent<InspectorResourceAgent>("Network")
     , m_pageAgent(pageAgent)
+    , m_editedResourcesContentManager(editedResourcesContentManager)
     , m_frontend(0)
     , m_resourcesData(adoptPtr(new NetworkResourcesData()))
     , m_isRecalculatingStyle(false)
     , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinishedReplayXHRFired)
 {
 }
 
 } // namespace blink