third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferSoftwareRenderingTest.cpp - Issue 2402273002: DrawingBuffer: Clean up GL state restoration

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/DrawingBufferSoftwareRenderingTest.cpp

Issue 2402273002: DrawingBuffer: Clean up GL state restoration (Closed)

Patch Set: Incorporate review feedback 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

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

Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferSoftwareRenderingTest.cpp

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

index f53a5966ce9d808e86a6d3837118951d2f084b9b..e45248acb5d1c1dc1ba3a022b3bc361e319eb6f5 100644

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

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

@@ -54,7 +54,7 @@ class DrawingBufferSoftwareRenderingTest : public Test {

new WebGraphicsContext3DProviderSoftwareRenderingForTests(

std::move(gl)));

m_drawingBuffer = DrawingBufferForTests::create(

- std::move(provider), initialSize, DrawingBuffer::Preserve);

+ std::move(provider), nullptr, initialSize, DrawingBuffer::Preserve);

CHECK(m_drawingBuffer);

}

@@ -70,7 +70,7 @@ TEST_F(DrawingBufferSoftwareRenderingTest, bitmapRecycling) {

IntSize initialSize(InitialWidth, InitialHeight);

IntSize alternateSize(InitialWidth, AlternateHeight);

- m_drawingBuffer->reset(initialSize);

+ m_drawingBuffer->resize(initialSize);

m_drawingBuffer->markContentsChanged();

m_drawingBuffer->PrepareTextureMailbox(

&textureMailbox, &releaseCallback1); // create a bitmap.

@@ -87,7 +87,7 @@ TEST_F(DrawingBufferSoftwareRenderingTest, bitmapRecycling) {

gpu::SyncToken(),

false /* lostResource */); // release bitmap to the recycling queue

EXPECT_EQ(1, m_drawingBuffer->recycledBitmapCount());

- m_drawingBuffer->reset(alternateSize);

+ m_drawingBuffer->resize(alternateSize);

m_drawingBuffer->markContentsChanged();

// Regression test for crbug.com/647896 - Next line must not crash

m_drawingBuffer->PrepareTextureMailbox(