sky/engine/platform/graphics/DecodingImageGenerator.h - Issue 952893003: Update from https://crrev.com/317530

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: sky/engine/platform/graphics/DecodingImageGenerator.h

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 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: sky/engine/platform/graphics/DecodingImageGenerator.h

diff --git a/sky/engine/platform/graphics/DecodingImageGenerator.h b/sky/engine/platform/graphics/DecodingImageGenerator.h

index 3d6ae39db98134a6028bfab59ec8126cf99222f8..a2e948e51856bf003730a9ccb4344e37940a420e 100644

--- a/sky/engine/platform/graphics/DecodingImageGenerator.h

+++ b/sky/engine/platform/graphics/DecodingImageGenerator.h

@@ -51,7 +51,7 @@ public:

protected:

virtual SkData* onRefEncodedData() override;

virtual bool onGetInfo(SkImageInfo*) override;

- virtual bool onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override;

+ virtual Result onGetPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override;

virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) override;

private: