DevTools: reduce ResourceAgent dependency on PageAgent.

Source/core/inspector/InspectorPageAgent.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 41 matching lines @@
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/VoidCallback.h"
 #include "core/html/imports/HTMLImport.h"
 #include "core/html/imports/HTMLImportLoader.h"
 #include "core/html/imports/HTMLImportsController.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/inspector/ContentSearchUtils.h"
 #include "core/inspector/DOMPatchSupport.h"
+#include "core/inspector/EditedResourcesContentManager.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorClient.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorOverlay.h"
 #include "core/inspector/InspectorResourceContentLoader.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/loader/CookieJar.h"
 #include "core/loader/DocumentLoader.h"
@@ skipping 226 matching lines @@
 bool InspectorPageAgent::dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result)
 {
     if (withBase64Encode) {
         *result = base64Encode(data, size);
         return true;
     }
 
     return decodeBuffer(data, size, textEncodingName, result);
 }
 
-PassOwnPtrWillBeRawPtr<InspectorPageAgent> InspectorPageAgent::create(Page* page, InjectedScriptManager* injectedScriptManager, InspectorClient* client, InspectorOverlay* overlay)
+PassOwnPtrWillBeRawPtr<InspectorPageAgent> InspectorPageAgent::create(Page* page, InjectedScriptManager* injectedScriptManager, EditedResourcesContentManager* editedResourcesContentManager, InspectorClient* client, InspectorOverlay* overlay)
 {
-    return adoptPtrWillBeNoop(new InspectorPageAgent(page, injectedScriptManager, client, overlay));
+    return adoptPtrWillBeNoop(new InspectorPageAgent(page, injectedScriptManager, editedResourcesContentManager, client, overlay));
 }
 
 Resource* InspectorPageAgent::cachedResource(LocalFrame* frame, const KURL& url)
 {
     Document* document = frame->document();
     if (!document)
         return 0;
     Resource* cachedResource = document->fetcher()->cachedResource(url);
     if (!cachedResource) {
         Vector<Document*> allImports = InspectorPageAgent::importsForFrame(frame);
@@ skipping 63 matching lines @@
         break;
     }
     return InspectorPageAgent::OtherResource;
 }
 
 TypeBuilder::Page::ResourceType::Enum InspectorPageAgent::cachedResourceTypeJson(const Resource& cachedResource)
 {
     return resourceTypeJson(cachedResourceType(cachedResource));
 }
 
-InspectorPageAgent::InspectorPageAgent(Page* page, InjectedScriptManager* injectedScriptManager, InspectorClient* client, InspectorOverlay* overlay)
+InspectorPageAgent::InspectorPageAgent(Page* page, InjectedScriptManager* injectedScriptManager, EditedResourcesContentManager* editedResourcesContentManager, InspectorClient* client, InspectorOverlay* overlay)
     : InspectorBaseAgent<InspectorPageAgent>("Page")
     , m_page(page)
     , m_injectedScriptManager(injectedScriptManager)
+    , m_editedResourcesContentManager(editedResourcesContentManager)
     , m_client(client)
     , m_frontend(0)
     , m_overlay(overlay)
     , m_lastScriptIdentifier(0)
     , m_enabled(false)
     , m_ignoreScriptsEnabledNotification(false)
     , m_deviceMetricsOverridden(false)
     , m_emulateMobileEnabled(false)
     , m_touchEmulationEnabled(false)
     , m_originalTouchEnabled(false)
@@ skipping 296 matching lines @@
     if (!errorString.isEmpty()) {
         callback->sendFailure(errorString);
         return;
     }
     callback->sendSuccess(content, base64Encoded);
 }
 
 void InspectorPageAgent::getResourceContent(ErrorString* errorString, const String& frameId, const String& url, PassRefPtr<GetResourceContentCallback> callback)
 {
     String content;
-    if (getEditedResourceContent(url, &content)) {
+    if (m_editedResourcesContentManager->get(url, &content)) {
         callback->sendSuccess(content, false);
         return;
     }
     if (!m_inspectorResourceContentLoader) {
         callback->sendFailure("Agent is not enabled.");
         return;
     }
     m_inspectorResourceContentLoader->ensureResourcesContentLoaded(adoptPtr(new GetResourceContentLoadListener(this, frameId, url, callback)));
 }
 
@@ skipping 673 matching lines @@
     }
     return true;
 }
 
 void InspectorPageAgent::setShowViewportSizeOnResize(ErrorString*, bool show, const bool* showGrid)
 {
     m_state->setBoolean(PageAgentState::showSizeOnResize, show);
     m_state->setBoolean(PageAgentState::showGridOnResize, asBool(showGrid));
 }
 
-void InspectorPageAgent::clearEditedResourcesContent()
-{
-    m_editedResourceContent.clear();
-}
-
-void InspectorPageAgent::addEditedResourceContent(const String& url, const String& content)
-{
-    m_editedResourceContent.set(url, content);
-}
-
-bool InspectorPageAgent::getEditedResourceContent(const String& url, String* content)
-{
-    if (!m_editedResourceContent.contains(url))
-        return false;
-    *content = m_editedResourceContent.get(url);
-    return true;
-}
-
 void InspectorPageAgent::trace(Visitor* visitor)
 {
     visitor->trace(m_page);
     visitor->trace(m_injectedScriptManager);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink