third_party/WebKit/Source/web/tests/WebFrameTest.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase + address review comments 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/web/tests/WebFrameTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

index d700a1cfc6905604814e849fcdee885e0d3934a0..2e165f3661b9f6d8aa3ab19dc818a1c99d67b378 100644

--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -6722,7 +6722,7 @@ TEST_P(ParameterizedWebFrameTest, NotifyManifestChange)

EXPECT_EQ(14, webFrameClient.manifestChangeCount());

}

-static ResourcePtr<Resource> fetchManifest(Document* document, const KURL& url)

+static PassRefPtrWillBeRawPtr<Resource> fetchManifest(Document* document, const KURL& url)

{

FetchRequest fetchRequest = FetchRequest(ResourceRequest(url), FetchInitiatorInfo());

fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextManifest);

@@ -6739,7 +6739,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestFetch)

webViewHelper.initializeAndLoad(m_baseURL + "foo.html");

Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFrame())->frame()->document();

- ResourcePtr<Resource> resource = fetchManifest(document, toKURL(m_baseURL + "link-manifest-fetch.json"));

+ RefPtrWillBeRawPtr<Resource> resource = fetchManifest(document, toKURL(m_baseURL + "link-manifest-fetch.json"));

EXPECT_TRUE(resource->isLoaded());

}

@@ -6753,7 +6753,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchAllow)

webViewHelper.initializeAndLoad(m_baseURL + "foo.html");

Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFrame())->frame()->document();

- ResourcePtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

+ RefPtrWillBeRawPtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

EXPECT_TRUE(resource->isLoaded());

}

@@ -6767,7 +6767,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelf)

webViewHelper.initializeAndLoad(m_baseURL + "foo.html");

Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFrame())->frame()->document();

- ResourcePtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

+ RefPtrWillBeRawPtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

EXPECT_EQ(0, resource.get()); // Fetching resource wasn't allowed.

}

@@ -6781,7 +6781,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelfReportOnly)

webViewHelper.initializeAndLoad(m_baseURL + "foo.html");

Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFrame())->frame()->document();

- ResourcePtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

+ RefPtrWillBeRawPtr<Resource> resource = fetchManifest(document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));

EXPECT_TRUE(resource->isLoaded());

}

« no previous file with comments | « third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp ('k') | no next file » | no next file with comments »