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

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

Issue 1118963002: Revert of DevTools: remove dependency of most agents on InspectorPageAgent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.h ('k') | Source/core/inspector/InspectorDOMAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorCSSAgent.cpp
diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp
index 8b615f56243bc0661d2a2d21fdbc706ee030f6c4..c067ea44134253dc23498228a295064ac8581e8b 100644
--- a/Source/core/inspector/InspectorCSSAgent.cpp
+++ b/Source/core/inspector/InspectorCSSAgent.cpp
@@ -54,9 +54,7 @@
#include "core/html/HTMLHeadElement.h"
#include "core/html/VoidCallback.h"
#include "core/inspector/InspectorHistory.h"
-#include "core/inspector/InspectorIdentifiers.h"
#include "core/inspector/InspectorPageAgent.h"
-#include "core/inspector/InspectorResolver.h"
#include "core/inspector/InspectorResourceAgent.h"
#include "core/inspector/InspectorResourceContentLoader.h"
#include "core/inspector/InspectorState.h"
@@ -429,9 +427,8 @@
return toCSSMediaRule(rule);
}
-InspectorCSSAgent::InspectorCSSAgent(LocalFrame* inspectedFrame, InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent)
+InspectorCSSAgent::InspectorCSSAgent(InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent)
: InspectorBaseAgent<InspectorCSSAgent, InspectorFrontend::CSS>("CSS")
- , m_inspectedFrame(inspectedFrame)
, m_domAgent(domAgent)
, m_pageAgent(pageAgent)
, m_resourceAgent(resourceAgent)
@@ -528,7 +525,7 @@
void InspectorCSSAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
{
- if (frame == m_inspectedFrame) {
+ if (frame == m_pageAgent->inspectedFrame()) {
reset();
m_editedStyleSheets.clear();
m_editedStyleElements.clear();
@@ -1026,7 +1023,7 @@
void InspectorCSSAgent::createStyleSheet(ErrorString* errorString, const String& frameId, TypeBuilder::CSS::StyleSheetId* outStyleSheetId)
{
- LocalFrame* frame = InspectorResolver::resolveFrame(m_inspectedFrame, frameId);
+ LocalFrame* frame = m_pageAgent->frameForId(frameId);
if (!frame) {
*errorString = "Frame not found";
return;
@@ -1568,7 +1565,6 @@
DEFINE_TRACE(InspectorCSSAgent)
{
- visitor->trace(m_inspectedFrame);
visitor->trace(m_domAgent);
visitor->trace(m_pageAgent);
visitor->trace(m_resourceAgent);
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.h ('k') | Source/core/inspector/InspectorDOMAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698