content/shell/test_runner/pixel_dump.cc - Issue 2855503003: Replace uses of legacy SkBitmap::copyTo() API

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: content/shell/test_runner/pixel_dump.cc

Issue 2855503003: Replace uses of legacy SkBitmap::copyTo() API (Closed)

Patch Set: Remove braces Created 3 years, 8 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:

Index: content/shell/test_runner/pixel_dump.cc

diff --git a/content/shell/test_runner/pixel_dump.cc b/content/shell/test_runner/pixel_dump.cc

index 123030fed6bc974b2c6f953d71e4a560010601f9..12eb7414ddcc87aa8d310a6a84fbf041880cfabc 100644

--- a/content/shell/test_runner/pixel_dump.cc

+++ b/content/shell/test_runner/pixel_dump.cc

@@ -131,7 +131,10 @@ void CaptureCallback::DidCompositeAndReadback(const SkBitmap& bitmap) {

return;

}

if (main_bitmap_.isNull()) {

- bitmap.deepCopyTo(&main_bitmap_);

+ if (main_bitmap_.tryAllocPixels(bitmap.info())) {

+ bitmap.readPixels(main_bitmap_.info(), main_bitmap_.getPixels(),

+ main_bitmap_.rowBytes(), 0, 0);

+ }

return;

}

SkCanvas canvas(main_bitmap_);