third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

Unified Diff: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

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

Patch Set: Fix known issues 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

« third_party/WebKit/Source/core/dom/ScriptLoader.cpp ('K') | « third_party/WebKit/Source/core/fetch/ImageResource.cpp ('k') | third_party/WebKit/Source/core/fetch/LinkFetchResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

index 9f13c66187d803f3a6e260c81e190135a521f0bc..6631f9e334018b5cbdbd2cc1751dfe737d9eed42 100644

--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

@@ -35,7 +35,6 @@

#include "core/fetch/MockImageResourceClient.h"

#include "core/fetch/ResourceFetcher.h"

#include "core/fetch/ResourceLoader.h"

-#include "core/fetch/ResourcePtr.h"

#include "core/fetch/UniqueIdentifier.h"

#include "platform/SharedBuffer.h"

#include "platform/exported/WrappedResourceResponse.h"

@@ -89,7 +88,7 @@ TEST(ImageResourceTest, MultipartImage)

URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");

// Emulate starting a real load, but don't expect any "real" WebURLLoaderClient callbacks.

- ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL), nullptr);

+ RefPtrWillBeRawPtr<ImageResource> cachedImage = ImageResource::create(ResourceRequest(testURL), nullptr);

cachedImage->setIdentifier(createUniqueIdentifier());

cachedImage->load(fetcher, ResourceLoaderOptions());

Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);

@@ -145,7 +144,7 @@ TEST(ImageResourceTest, CancelOnDetach)

ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);

// Emulate starting a real load.

- ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL), nullptr);

+ RefPtrWillBeRawPtr<ImageResource> cachedImage = ImageResource::create(ResourceRequest(testURL), nullptr);

cachedImage->setIdentifier(createUniqueIdentifier());

cachedImage->load(fetcher, ResourceLoaderOptions());

@@ -169,7 +168,7 @@ TEST(ImageResourceTest, CancelOnDetach)

TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)

{

- ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(), nullptr);

+ RefPtrWillBeRawPtr<ImageResource> cachedImage = ImageResource::create(ResourceRequest(), nullptr);

cachedImage->setLoading(true);

MockImageResourceClient client(cachedImage);

@@ -202,7 +201,7 @@ TEST(ImageResourceTest, DecodedDataRemainsWhileHasClients)

TEST(ImageResourceTest, UpdateBitmapImages)

{

- ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(), nullptr);

+ RefPtrWillBeRawPtr<ImageResource> cachedImage = ImageResource::create(ResourceRequest(), nullptr);

cachedImage->setLoading(true);

MockImageResourceClient client(cachedImage);