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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (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/InspectorPageAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index 8dcbce9c003da4295922bc31f6e84ff2d445a341..4f6988f58186f69783aad1f8971a20931502ec0e 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -254,9 +254,9 @@ bool InspectorPageAgent::dataContent(const char* data, unsigned size, const Stri
return decodeBuffer(data, size, textEncodingName, result);
}
-PassOwnPtrWillBeRawPtr<InspectorPageAgent> InspectorPageAgent::create(InspectedFrames* inspectedFrames, Client* client, InspectorResourceContentLoader* resourceContentLoader, InspectorDebuggerAgent* debuggerAgent)
+RawPtr<InspectorPageAgent> InspectorPageAgent::create(InspectedFrames* inspectedFrames, Client* client, InspectorResourceContentLoader* resourceContentLoader, InspectorDebuggerAgent* debuggerAgent)
{
- return adoptPtrWillBeNoop(new InspectorPageAgent(inspectedFrames, client, resourceContentLoader, debuggerAgent));
+ return (new InspectorPageAgent(inspectedFrames, client, resourceContentLoader, debuggerAgent));
}
Resource* InspectorPageAgent::cachedResource(LocalFrame* frame, const KURL& url)
@@ -266,7 +266,7 @@ Resource* InspectorPageAgent::cachedResource(LocalFrame* frame, const KURL& url)
return nullptr;
Resource* cachedResource = document->fetcher()->cachedResource(url);
if (!cachedResource) {
- WillBeHeapVector<RawPtrWillBeMember<Document>> allImports = InspectorPageAgent::importsForFrame(frame);
+ HeapVector<Member<Document>> allImports = InspectorPageAgent::importsForFrame(frame);
for (Document* import : allImports) {
cachedResource = import->fetcher()->cachedResource(url);
if (cachedResource)
@@ -430,7 +430,7 @@ void InspectorPageAgent::navigate(ErrorString*, const String& url, String* outFr
*outFrameId = frameId(m_inspectedFrames->root());
}
-static void cachedResourcesForDocument(Document* document, WillBeHeapVector<RawPtrWillBeMember<Resource>>& result, bool skipXHRs)
+static void cachedResourcesForDocument(Document* document, HeapVector<Member<Resource>>& result, bool skipXHRs)
{
const ResourceFetcher::DocumentResourceMap& allResources = document->fetcher()->allResources();
for (const auto& resource : allResources) {
@@ -463,9 +463,9 @@ static void cachedResourcesForDocument(Document* document, WillBeHeapVector<RawP
}
// static
-WillBeHeapVector<RawPtrWillBeMember<Document>> InspectorPageAgent::importsForFrame(LocalFrame* frame)
+HeapVector<Member<Document>> InspectorPageAgent::importsForFrame(LocalFrame* frame)
{
- WillBeHeapVector<RawPtrWillBeMember<Document>> result;
+ HeapVector<Member<Document>> result;
Document* rootDocument = frame->document();
if (HTMLImportsController* controller = rootDocument->importsController()) {
@@ -478,11 +478,11 @@ WillBeHeapVector<RawPtrWillBeMember<Document>> InspectorPageAgent::importsForFra
return result;
}
-static WillBeHeapVector<RawPtrWillBeMember<Resource>> cachedResourcesForFrame(LocalFrame* frame, bool skipXHRs)
+static HeapVector<Member<Resource>> cachedResourcesForFrame(LocalFrame* frame, bool skipXHRs)
{
- WillBeHeapVector<RawPtrWillBeMember<Resource>> result;
+ HeapVector<Member<Resource>> result;
Document* rootDocument = frame->document();
- WillBeHeapVector<RawPtrWillBeMember<Document>> loaders = InspectorPageAgent::importsForFrame(frame);
+ HeapVector<Member<Document>> loaders = InspectorPageAgent::importsForFrame(frame);
cachedResourcesForDocument(rootDocument, result, skipXHRs);
for (size_t i = 0; i < loaders.size(); ++i)
@@ -732,7 +732,7 @@ PassRefPtr<TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObject
.setFrame(frameObject)
.setResources(subresources);
- WillBeHeapVector<RawPtrWillBeMember<Resource>> allResources = cachedResourcesForFrame(frame, true);
+ HeapVector<Member<Resource>> allResources = cachedResourcesForFrame(frame, true);
for (Resource* cachedResource : allResources) {
RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create()
.setUrl(urlWithoutFragment(cachedResource->url()).string())
@@ -745,7 +745,7 @@ PassRefPtr<TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObject
subresources->addItem(resourceObject);
}
- WillBeHeapVector<RawPtrWillBeMember<Document>> allImports = InspectorPageAgent::importsForFrame(frame);
+ HeapVector<Member<Document>> allImports = InspectorPageAgent::importsForFrame(frame);
for (Document* import : allImports) {
RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create()
.setUrl(urlWithoutFragment(import->url()).string())

Powered by Google App Engine
This is Rietveld 408576698