Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1323)

Unified Diff: Source/core/inspector/InspectorPageAgent.cpp

Issue 445023005: DevTools: reduce ResourceAgent dependency on PageAgent. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorPageAgent.cpp
diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
index eb3a7dc6e39b64af6dde48a2d4e08a11001c43f9..3b41b173a2c6aab1da2ab900595e000adae9cacc 100644
--- a/Source/core/inspector/InspectorPageAgent.cpp
+++ b/Source/core/inspector/InspectorPageAgent.cpp
@@ -59,6 +59,7 @@
#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"
@@ -305,9 +306,9 @@ bool InspectorPageAgent::dataContent(const char* data, unsigned size, const Stri
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)
@@ -391,10 +392,11 @@ TypeBuilder::Page::ResourceType::Enum InspectorPageAgent::cachedResourceTypeJson
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)
@@ -711,7 +713,7 @@ void InspectorPageAgent::getResourceContentAfterResourcesContentLoaded(const Str
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;
}
@@ -1405,24 +1407,6 @@ void InspectorPageAgent::setShowViewportSizeOnResize(ErrorString*, bool show, co
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);

Powered by Google App Engine
This is Rietveld 408576698