| Index: Source/core/inspector/InspectorCSSAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorCSSAgent.cpp b/Source/core/inspector/InspectorCSSAgent.cpp
|
| index c3b82416d50ef14f5dbbfa91ff06e83431d6c84a..81b647748bf4eb718acd2a648a4d1a667225c77d 100644
|
| --- a/Source/core/inspector/InspectorCSSAgent.cpp
|
| +++ b/Source/core/inspector/InspectorCSSAgent.cpp
|
| @@ -54,6 +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/InspectorResourceAgent.h"
|
| #include "core/inspector/InspectorResourceContentLoader.h"
|
| @@ -427,8 +428,9 @@ CSSMediaRule* InspectorCSSAgent::asCSSMediaRule(CSSRule* rule)
|
| return toCSSMediaRule(rule);
|
| }
|
|
|
| -InspectorCSSAgent::InspectorCSSAgent(InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent)
|
| +InspectorCSSAgent::InspectorCSSAgent(LocalFrame* inspectedFrame, InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent)
|
| : InspectorBaseAgent<InspectorCSSAgent, InspectorFrontend::CSS>("CSS")
|
| + , m_inspectedFrame(inspectedFrame)
|
| , m_domAgent(domAgent)
|
| , m_pageAgent(pageAgent)
|
| , m_resourceAgent(resourceAgent)
|
| @@ -525,7 +527,7 @@ void InspectorCSSAgent::disable(ErrorString*)
|
|
|
| void InspectorCSSAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
|
| {
|
| - if (frame == m_pageAgent->inspectedFrame()) {
|
| + if (frame == m_inspectedFrame) {
|
| reset();
|
| m_editedStyleSheets.clear();
|
| }
|
| @@ -1009,8 +1011,8 @@ void InspectorCSSAgent::setMediaText(ErrorString* errorString, const String& sty
|
|
|
| void InspectorCSSAgent::createStyleSheet(ErrorString* errorString, const String& frameId, TypeBuilder::CSS::StyleSheetId* outStyleSheetId)
|
| {
|
| - LocalFrame* frame = m_pageAgent->frameForId(frameId);
|
| - if (!frame) {
|
| + LocalFrame* frame = InspectorIdentifiers<LocalFrame>::lookup(frameId);
|
| + if (!frame || frame->instrumentingAgents() != m_inspectedFrame->instrumentingAgents()) {
|
| *errorString = "Frame not found";
|
| return;
|
| }
|
| @@ -1551,6 +1553,7 @@ void InspectorCSSAgent::resetPseudoStates()
|
|
|
| DEFINE_TRACE(InspectorCSSAgent)
|
| {
|
| + visitor->trace(m_inspectedFrame);
|
| visitor->trace(m_domAgent);
|
| visitor->trace(m_pageAgent);
|
| visitor->trace(m_resourceAgent);
|
|
|