third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp - Issue 2270533002: cc: Remove the software compositing bool from PrepareTextureMailbox

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

Issue 2270533002: cc: Remove the software compositing bool from PrepareTextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@softwarerendering

Patch Set: remove-prepare-mailbox-param: bad-merge Created 4 years, 4 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.h ('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/DrawingBuffer.cpp

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

index 431a1fd2a02737bfbccd2dd663c8ddeda8c55397..b2c395f6d3d97a31fead115ea742925035837f99 100644

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

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

@@ -261,9 +261,7 @@ std::unique_ptr<cc::SharedBitmap> DrawingBuffer::createOrRecycleBitmap()

return Platform::current()->allocateSharedBitmap(m_size);

}

-bool DrawingBuffer::PrepareTextureMailbox(cc::TextureMailbox* outMailbox,

- std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback,

- bool useSharedMemory)

+bool DrawingBuffer::PrepareTextureMailbox(cc::TextureMailbox* outMailbox, std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback)

{

bool forceGpuResult = false;

return prepareTextureMailboxInternal(outMailbox, outReleaseCallback, forceGpuResult);