| Index: Source/core/inspector/InspectorStyleSheet.cpp
|
| diff --git a/Source/core/inspector/InspectorStyleSheet.cpp b/Source/core/inspector/InspectorStyleSheet.cpp
|
| index 7bd978115ad623958e2d6ccf43da2a5cb2689533..0beaedc081b4215114f64bea73a39823e7e86f91 100644
|
| --- a/Source/core/inspector/InspectorStyleSheet.cpp
|
| +++ b/Source/core/inspector/InspectorStyleSheet.cpp
|
| @@ -46,7 +46,6 @@
|
| #include "core/inspector/ContentSearchUtils.h"
|
| #include "core/inspector/InspectorCSSAgent.h"
|
| #include "core/inspector/InspectorPageAgent.h"
|
| -#include "core/inspector/InspectorResourceAgent.h"
|
| #include "core/svg/SVGStyleElement.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassOwnPtr.h"
|
| @@ -945,15 +944,14 @@ bool InspectorStyleSheetBase::findPropertyByRange(const SourceRange& sourceRange
|
| return false;
|
| }
|
|
|
| -PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
|
| +PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
|
| {
|
| - return adoptRef(new InspectorStyleSheet(pageAgent, resourceAgent, id, pageStyleSheet, origin, documentURL, listener));
|
| + return adoptRef(new InspectorStyleSheet(pageAgent, id, pageStyleSheet, origin, documentURL, listener));
|
| }
|
|
|
| -InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
|
| +InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum origin, const String& documentURL, Listener* listener)
|
| : InspectorStyleSheetBase(id, listener)
|
| , m_pageAgent(pageAgent)
|
| - , m_resourceAgent(resourceAgent)
|
| , m_pageStyleSheet(pageStyleSheet)
|
| , m_origin(origin)
|
| , m_documentURL(documentURL)
|
| @@ -1523,9 +1521,10 @@ bool InspectorStyleSheet::resourceStyleSheetText(String* result) const
|
| if (!ownerDocument() || !ownerDocument()->frame())
|
| return false;
|
|
|
| + String error;
|
| bool base64Encoded;
|
| - bool success = m_resourceAgent->fetchResourceContent(ownerDocument()->frame(), KURL(ParsedURLString, m_pageStyleSheet->href()), result, &base64Encoded) && !base64Encoded;
|
| - return success;
|
| + InspectorPageAgent::resourceContent(&error, ownerDocument()->frame(), KURL(ParsedURLString, m_pageStyleSheet->href()), result, &base64Encoded);
|
| + return error.isEmpty() && !base64Encoded;
|
| }
|
|
|
| bool InspectorStyleSheet::inlineStyleSheetText(String* result) const
|
|
|