third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp ('k') | third_party/WebKit/Source/platform/graphics/SkiaTextureHolder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

index f630f2d4b1ffdf2a08283741ffa569713610c331..a79f95da18af2cce2f82da4bae96dffd417f8721 100644

--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurfaceTest.cpp

@@ -80,7 +80,7 @@ class MockSurfaceFactory : public RecordingImageBufferFallbackSurfaceFactory {

sk_sp<SkColorSpace> colorSpace,

SkColorType colorType) {

m_createSurfaceCount++;

- return wrapUnique(new UnacceleratedImageBufferSurface(

+ return WTF::wrapUnique(new UnacceleratedImageBufferSurface(

size, opacityMode, InitializeImagePixels, std::move(colorSpace),

colorType));

}

@@ -97,10 +97,10 @@ class RecordingImageBufferSurfaceTest : public Test {

protected:

RecordingImageBufferSurfaceTest() {

std::unique_ptr<MockSurfaceFactory> surfaceFactory =

- makeUnique<MockSurfaceFactory>();

+ WTF::makeUnique<MockSurfaceFactory>();

m_surfaceFactory = surfaceFactory.get();

std::unique_ptr<RecordingImageBufferSurface> testSurface =

- wrapUnique(new RecordingImageBufferSurface(

+ WTF::wrapUnique(new RecordingImageBufferSurface(

IntSize(10, 10), std::move(surfaceFactory), NonOpaque, nullptr));

m_testSurface = testSurface.get();

// We create an ImageBuffer in order for the testSurface to be

@@ -108,7 +108,7 @@ class RecordingImageBufferSurfaceTest : public Test {

m_imageBuffer = ImageBuffer::create(std::move(testSurface));

EXPECT_FALSE(!m_imageBuffer);

m_fakeImageBufferClient =

- wrapUnique(new FakeImageBufferClient(m_imageBuffer.get()));

+ WTF::wrapUnique(new FakeImageBufferClient(m_imageBuffer.get()));

m_imageBuffer->setClient(m_fakeImageBufferClient.get());

}