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

Unified Diff: third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.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
Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
index 2102dd97ff165df29ae491622067d9aef5f93677..184a278d2d0a5d5408066a8a18bb8109a92753ef 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp
@@ -54,11 +54,12 @@ class DrawingBufferTest : public Test {
void SetUp() override {
IntSize initialSize(InitialWidth, InitialHeight);
std::unique_ptr<GLES2InterfaceForTests> gl =
- wrapUnique(new GLES2InterfaceForTests);
+ WTF::wrapUnique(new GLES2InterfaceForTests);
m_gl = gl.get();
SetAndSaveRestoreState(false);
std::unique_ptr<WebGraphicsContext3DProviderForTests> provider =
- wrapUnique(new WebGraphicsContext3DProviderForTests(std::move(gl)));
+ WTF::wrapUnique(
+ new WebGraphicsContext3DProviderForTests(std::move(gl)));
m_drawingBuffer = DrawingBufferForTests::create(
std::move(provider), m_gl, initialSize, DrawingBuffer::Preserve);
CHECK(m_drawingBuffer);
@@ -347,11 +348,12 @@ class DrawingBufferImageChromiumTest : public DrawingBufferTest {
void SetUp() override {
IntSize initialSize(InitialWidth, InitialHeight);
std::unique_ptr<GLES2InterfaceForTests> gl =
- wrapUnique(new GLES2InterfaceForTests);
+ WTF::wrapUnique(new GLES2InterfaceForTests);
m_gl = gl.get();
SetAndSaveRestoreState(true);
std::unique_ptr<WebGraphicsContext3DProviderForTests> provider =
- wrapUnique(new WebGraphicsContext3DProviderForTests(std::move(gl)));
+ WTF::wrapUnique(
+ new WebGraphicsContext3DProviderForTests(std::move(gl)));
RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(true);
m_imageId0 = m_gl->nextImageIdToBeCreated();
EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId0)).Times(1);
@@ -591,10 +593,11 @@ TEST(DrawingBufferDepthStencilTest, packedDepthStencilSupported) {
for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
SCOPED_TRACE(cases[i].testCaseName);
std::unique_ptr<DepthStencilTrackingGLES2Interface> gl =
- wrapUnique(new DepthStencilTrackingGLES2Interface);
+ WTF::wrapUnique(new DepthStencilTrackingGLES2Interface);
DepthStencilTrackingGLES2Interface* trackingGL = gl.get();
std::unique_ptr<WebGraphicsContext3DProviderForTests> provider =
- wrapUnique(new WebGraphicsContext3DProviderForTests(std::move(gl)));
+ WTF::wrapUnique(
+ new WebGraphicsContext3DProviderForTests(std::move(gl)));
DrawingBuffer::PreserveDrawingBuffer preserve = DrawingBuffer::Preserve;
bool premultipliedAlpha = false;

Powered by Google App Engine
This is Rietveld 408576698