third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp - Issue 2399733002: DrawingBuffer cleanup: Part 1 of many

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/gpu/DrawingBufferTest.cpp

Issue 2399733002: DrawingBuffer cleanup: Part 1 of many (Closed)

Patch Set: Fix unittests Created 4 years, 2 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/platform/graphics/gpu/DrawingBuffer.cpp ('K') | « third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1e48e05dbb1b736c07f0feea27786258f1f6591a..ca2d94135deea63d6b2b6908bfb359519af156df 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp

@@ -326,6 +326,8 @@ TEST_F(DrawingBufferImageChromiumTest, verifyResizingReallocatesImages) {

EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId2)).Times(1);

EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId0)).Times(1);

EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId0)).Times(1);

+ EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId1)).Times(1);

+ EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId1)).Times(1);

// Resize to 100x50.

m_drawingBuffer->reset(alternateSize);

releaseCallback->Run(gpu::SyncToken(), false /* lostResource */);

@@ -333,8 +335,6 @@ TEST_F(DrawingBufferImageChromiumTest, verifyResizingReallocatesImages) {

GLuint m_imageId3 = m_gl->nextImageIdToBeCreated();

EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId3)).Times(1);

- EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId1)).Times(1);

- EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId1)).Times(1);

// Produce a mailbox at this size.

m_drawingBuffer->markContentsChanged();

EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,

@@ -347,6 +347,8 @@ TEST_F(DrawingBufferImageChromiumTest, verifyResizingReallocatesImages) {

EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId4)).Times(1);

EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId2)).Times(1);

EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId2)).Times(1);

+ EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId3)).Times(1);

+ EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId3)).Times(1);

// Reset to initial size.

m_drawingBuffer->reset(initialSize);

releaseCallback->Run(gpu::SyncToken(), false /* lostResource */);

@@ -354,8 +356,6 @@ TEST_F(DrawingBufferImageChromiumTest, verifyResizingReallocatesImages) {

GLuint m_imageId5 = m_gl->nextImageIdToBeCreated();

EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId5)).Times(1);

- EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId3)).Times(1);

- EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId3)).Times(1);

// Prepare another mailbox and verify that it's the correct size.

m_drawingBuffer->markContentsChanged();

EXPECT_TRUE(m_drawingBuffer->PrepareTextureMailbox(&textureMailbox,