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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp

Issue 1745423002: DevTools: migrate protocol values from RefPtr to OwnPtr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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: third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
index 6f067e39c18a099a5b0458b78d0ea3e0ff92a906..e1d605844823759223b21c3935186efcd8b7148a 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp
@@ -111,11 +111,11 @@ bool matches(const String& url, const String& pattern)
static PassOwnPtr<protocol::Network::Headers> buildObjectForHeaders(const HTTPHeaderMap& headers)
{
- RefPtr<protocol::DictionaryValue> headersObject = protocol::DictionaryValue::create();
+ OwnPtr<protocol::DictionaryValue> headersObject = protocol::DictionaryValue::create();
for (const auto& header : headers)
headersObject->setString(header.key.string(), header.value);
protocol::ErrorSupport errors;
- return protocol::Network::Headers::parse(headersObject, &errors);
+ return protocol::Network::Headers::parse(headersObject.get(), &errors);
}
class InspectorFileReaderLoaderClient final : public FileReaderLoaderClient {
@@ -300,7 +300,6 @@ static PassOwnPtr<protocol::Network::Response> buildObjectForResourceResponse(co
status = response.httpStatusCode();
statusText = response.httpStatusText();
}
- RefPtr<protocol::DictionaryValue> headers;
HTTPHeaderMap headersMap;
if (response.resourceLoadInfo() && response.resourceLoadInfo()->responseHeaders.size())
headersMap = response.resourceLoadInfo()->responseHeaders;
@@ -439,7 +438,7 @@ DEFINE_TRACE(InspectorResourceAgent)
bool InspectorResourceAgent::shouldBlockRequest(const ResourceRequest& request)
{
- RefPtr<protocol::DictionaryValue> blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
+ protocol::DictionaryValue* blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
if (!blockedURLs)
return false;
String url = request.url().string();
@@ -502,7 +501,7 @@ void InspectorResourceAgent::willSendRequest(LocalFrame* frame, unsigned long id
if (initiatorInfo.name == FetchInitiatorTypeNames::document && loader->substituteData().isValid())
return;
- RefPtr<protocol::DictionaryValue> headers = m_state->getObject(ResourceAgentState::extraRequestHeaders);
+ protocol::DictionaryValue* headers = m_state->getObject(ResourceAgentState::extraRequestHeaders);
if (headers) {
for (const auto& header : *headers) {
String value;
@@ -967,17 +966,18 @@ void InspectorResourceAgent::getResponseBody(ErrorString* errorString, const Str
void InspectorResourceAgent::addBlockedURL(ErrorString*, const String& url)
{
- RefPtr<protocol::DictionaryValue> blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
+ protocol::DictionaryValue* blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
if (!blockedURLs) {
- blockedURLs = protocol::DictionaryValue::create();
- m_state->setObject(ResourceAgentState::blockedURLs, blockedURLs);
+ OwnPtr<protocol::DictionaryValue> newList = protocol::DictionaryValue::create();
+ blockedURLs = newList.get();
+ m_state->setObject(ResourceAgentState::blockedURLs, newList.release());
}
blockedURLs->setBoolean(url, true);
}
void InspectorResourceAgent::removeBlockedURL(ErrorString*, const String& url)
{
- RefPtr<protocol::DictionaryValue> blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
+ protocol::DictionaryValue* blockedURLs = m_state->getObject(ResourceAgentState::blockedURLs);
if (blockedURLs)
blockedURLs->remove(url);
}

Powered by Google App Engine
This is Rietveld 408576698